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

Merge release 1.50.0 to develop - #3333

Merged
mchowning merged 11 commits into
developfrom
merge_release_1.50.0_to_develop
Apr 2, 2021
Merged

mchowning merged 11 commits into
developfrom
merge_release_1.50.0_to_develop

Conversation

@jd-alexander

@jd-alexander jd-alexander commented Apr 2, 2021 •

Copy link
Copy Markdown
Contributor

This PR merges changes for release 1.50.0 back to develop to brink it up to date with trunk.

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.

mkevins and others added 9 commits March 18, 2021 14:56
* Update reference to gutenberg to include search button positioning

* Update gutenberg ref

* Update gutenberg ref

* Update gutenberg reference to include Search block button positioning

* updated gutenberg ref.

* updated gutenberg ref with merge commit.

* Update gutenberg ref

* Update reference to gutenberg to include PR #29599

* Update gutenberg ref

* Release script: Update gb mobile version to 1.48.0

* Release script: Update gutenberg ref

* Release script: Update bundle for: 1.48.0

* Update bundles

* Update Release notes

* Update makepot command to exclude e2e-tests strings

* Update strings

* Update typo in Release notes

* Update bundles

* Update gutenberge reference

* Update bundle

* Adds .swiftlint.yml to disable running the localization_comment rule in the strings file (#3223)

* Add missing release notes for the removal of the cancel button in settings for Android

* Bump gutenberg from `f3ee192` to `6be7320` (#3265)

Bumps [gutenberg](https://github.com/WordPress/gutenberg) from `f3ee192` to `6be7320`.
- [Release notes](https://github.com/WordPress/gutenberg/releases)
- [Commits](WordPress/gutenberg@f3ee192...6be7320)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Release script: Update gb mobile version to 1.49.0

* Release script: Update gutenberg ref

* Release script: Update bundle for: 1.49.0

* Update Gutenberg ref after rebase

* Update Gutenberg to handle revert of split issue

* Update bundle

* Update Changelog

* Release Process Rerun bundle

Co-authored-by: Amanda Riu <amanda.riu@automattic.com>
Co-authored-by: Carlos Garcia <fluiddot@gmail.com>
Co-authored-by: AmandaRiu <5810477+AmandaRiu@users.noreply.github.com>
Co-authored-by: Joel Dean <jdeanjj1000@gmail.com>
Co-authored-by: Enej Bajgoric <enej.bajgoric@automattic.com>
Co-authored-by: Gerardo Pacheco <gerardo.pacheco@automattic.com>
Co-authored-by: Cameron Voell <cameronvoell@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Chip Snyder <chip.snyder3@gmail.com>
@peril-wordpress-mobile

Copy link
Copy Markdown

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

@jd-alexander
jd-alexander requested review from mchowning and removed request for guarani April 2, 2021 00:46

@mchowning mchowning 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.

Smoke tested and looks good!

@mchowning
mchowning merged commit 0be4fd0 into develop Apr 2, 2021
@mchowning
mchowning deleted the merge_release_1.50.0_to_develop branch April 2, 2021 13:47
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants