Skip to content

Merge release 1.50.1 to develop#3364

Merged
guarani merged 13 commits intodevelopfrom
merge_release_1.50.1_to_develop
Apr 16, 2021
Merged

Merge release 1.50.1 to develop#3364
guarani merged 13 commits intodevelopfrom
merge_release_1.50.1_to_develop

Conversation

@guarani
Copy link
Contributor

@guarani guarani commented Apr 10, 2021

Brings 1.50.1 changes from trunk to develop. This third branch is just used to resolve merge conflicts without pushing to the trunk branch, thus leaving it preserved as it was at time of release.

To test: Check CI is green.

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.

@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented Apr 10, 2021

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

@guarani guarani enabled auto-merge April 10, 2021 17:46
@guarani
Copy link
Contributor Author

guarani commented Apr 12, 2021

I just want to mention @jd-alexander that there are no changes to the Gutenberg submodule ref here. I think it's because after this PR was created, someone merged a PR that updated the ref, which includes the now merged Gutenberg release changes PR.

@jd-alexander
Copy link
Contributor

I just want to mention @jd-alexander that there are no changes to the Gutenberg submodule ref here. I think it's because after this PR was created, someone merged a PR that updated the ref, which includes the now merged Gutenberg release changes PR.

Thanks, Paul! I will be able to merge this in as soon as the bintray is back up and the binary build is able to be built. More details here https://status.bintray.com/incidents/4mzph0y8l6hk?u=jj8txkhpy19j

@jd-alexander
Copy link
Contributor

@guarani I was about to merge this in since the bintray build passed but there are some conflicts here due to the bundle updates made here #3376

@guarani guarani merged commit 2ddf84e into develop Apr 16, 2021
@guarani guarani deleted the merge_release_1.50.1_to_develop branch April 16, 2021 15:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants