Skip to content
This repository was archived by the owner on Jul 9, 2026. It is now read-only.

Merge release 1.40.0 to develop - #2772

Merged
hypest merged 8 commits into
developfrom
merge_release_1.40.0_to_develop
Nov 4, 2020
Merged

Merge release 1.40.0 to develop#2772
hypest merged 8 commits into
developfrom
merge_release_1.40.0_to_develop

Conversation

@cameronvoell

Copy link
Copy Markdown
Contributor

Brings back changes from 1.40.0 release to develop

PR submission checklist:

  • I have considered adding unit tests where possible.
  • I have considered if this change warrants user-facing release notes more info and have added them to RELEASE-NOTES.txt if necessary.

@cameronvoell
cameronvoell requested a review from ceyhun November 3, 2020 08:35
@cameronvoell

cameronvoell commented Nov 3, 2020

Copy link
Copy Markdown
Contributor Author

@ceyhun if CI passes on the gutenberg PR and we merge that one, we'll just need to resolve the conflict on this PR and update to the gutenberg reference to the gutenberg release merged on master, and then this PR should be ready to go.

@peril-wordpress-mobile

peril-wordpress-mobile Bot commented Nov 3, 2020

Copy link
Copy Markdown

Wanna run full suite of Android and iOS UI tests? Click here and 'Approve' CI job!

@ceyhun ceyhun left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good 👍 @hypest the failing required android test is also failing on develop, can you still go ahead and merge this please.

@hypest

hypest commented Nov 4, 2020

Copy link
Copy Markdown
Contributor

OK, thanks Ceyhun! I will admin-merge this now by lifting (and then reinstating) the "Include administrators" in the repo's settings that govern whether failed checks can block admins or not from merging.

@hypest
hypest merged commit 657807b into develop Nov 4, 2020
@hypest
hypest deleted the merge_release_1.40.0_to_develop branch November 4, 2020 09:30
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants