Skip to content

Conversation

@dcalhoun
Copy link
Member

@dcalhoun dcalhoun commented Oct 13, 2021

Merges the changes from the 1.63.1 into the develop branch.

To test: Verify the gutenberg ref matches the merge commit of the Gutenberg 1.63.1 PR: 2cf54e2a613d1383e8302a231f1492d64cef770c

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.

@dcalhoun dcalhoun added this to the 1.63.1 (18.4) milestone Oct 13, 2021
@dcalhoun dcalhoun self-assigned this Oct 13, 2021
@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented Oct 13, 2021

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

These are included in the 1.63.1 release section.
@dcalhoun dcalhoun marked this pull request as ready for review October 13, 2021 14:04
@dcalhoun dcalhoun requested a review from guarani October 13, 2021 14:05
@dcalhoun dcalhoun enabled auto-merge October 13, 2021 14:05
Copy link
Contributor

@guarani guarani left a comment

Choose a reason for hiding this comment

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

The diff here LGTM! 🙇

Trigger CI build as an attempt to bypass flakey tests.
@dcalhoun dcalhoun merged commit 4b4e08e into develop Oct 13, 2021
@dcalhoun dcalhoun deleted the merge_release_1.63.1_to_develop branch October 13, 2021 18:13
mokagio added a commit to wordpress-mobile/WordPress-iOS that referenced this pull request Oct 14, 2021
….0.2-into-develop

Conflicts on `Podfile` and `Podfile.lock`, I solved them by keeping
1.63.1, the version on the release branch. On `develop`, we a 1.64.0
pre-release but it doesn't yet contain those fixes. They'll come in when
a new pre-release or a stable version of 1.64.0 is cut, as they are
already in Gutenberg mobile's develop:
wordpress-mobile/gutenberg-mobile#4113
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.

4 participants