Skip to content

chore: merge master branch to develop#2396

Merged
jasonbahl merged 9 commits intowp-graphql:developfrom
justlevine:fix/merge-main-to-develop
Jun 3, 2022
Merged

chore: merge master branch to develop#2396
jasonbahl merged 9 commits intowp-graphql:developfrom
justlevine:fix/merge-main-to-develop

Conversation

@justlevine
Copy link
Copy Markdown
Collaborator

@justlevine justlevine commented May 28, 2022

What does this implement/fix? Explain your changes.

v1.8.2 was merged directly with the master branch, instead of the usual release/branch -> develop -> master.

This PR pulls those changes back onto the develop branch.

Does this close any currently open issues?

Any relevant logs, error output, GraphiQL screenshots, etc?

(If it’s long, please paste to https://ghostbin.com/ and insert the link here.)

Any other comments?

Might make sense to set some branch protection rules to enforce the following rules, instead of just as a note in the PULL_REQUEST_TEMPLATE

  1. Only PRs from develop can be merged with master.
  2. All other PRs must be merged to develop.

Ref:

Where has this been tested?

Operating System: N/A

WordPress Version: N/A

@justlevine justlevine added status: in review Awaiting review before merging or closing type: chore Maintenance tasks, refactoring, and other non-functional changes labels May 28, 2022
@justlevine justlevine force-pushed the fix/merge-main-to-develop branch from 68c056f to 8e94bca Compare May 28, 2022 02:25
@qlty-cloud-legacy
Copy link
Copy Markdown

Code Climate has analyzed commit 8e94bca and detected 0 issues on this pull request.

View more on Code Climate.

@coveralls
Copy link
Copy Markdown

coveralls commented May 28, 2022

Coverage Status

Coverage remained the same at 79.867% when pulling 8e94bca on justlevine:fix/merge-main-to-develop into 2054b01 on wp-graphql:develop.

@justlevine
Copy link
Copy Markdown
Collaborator Author

Note: had to explicitly set wp-graphql/wp-graphql-test-case to ~2.1.3, since 2.3.0 isn't compatible with PHPUnit 8.5

@jasonbahl jasonbahl merged commit d9de455 into wp-graphql:develop Jun 3, 2022
@justlevine justlevine deleted the fix/merge-main-to-develop branch June 3, 2022 15:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

status: in review Awaiting review before merging or closing type: chore Maintenance tasks, refactoring, and other non-functional changes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants