Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release 1.69.1 to develop #4489

Merged
merged 9 commits into from
Jan 20, 2022
Merged

Conversation

mkevins
Copy link
Contributor

@mkevins mkevins commented Jan 19, 2022

This PR merges the 1.69.1 betafix release back 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.

Copy link
Contributor

@ttahmouch ttahmouch left a comment

Choose a reason for hiding this comment

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

The changes LGTM. Thanks for updating develop, @mkevins . :)

@@ -7,16 +7,21 @@ Unreleased
* [*] Fix missing translations of color settings [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4479]
* [*] Fix cut-off setting labels by properly wrapping the text [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4475]
* [*] Highlight text: fix applying formatting for non-selected text [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4471]
* [**] Fix Android handling of Hebrew and Indonesian translations [https://github.com/wordpress-mobile/gutenberg-mobile/pull/4397]
Copy link
Contributor

Choose a reason for hiding this comment

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

I see this was moved to Unreleased as it sounds like it was merged to develop after we cut the beta fix. I haven't confirmed timing of anything, but I saw that there was a pending question here. Was this confirmed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, this looks like it was auto-resolved incorrectly by git (the PR had been created prior to the release branch, but it didn't land until after the cut, so it was actually in the "Unreleased" section of the notes in the PR itself. It seems that when it was merged into develop, the new version headings were already present in the notes, but this line was added under them, when it should have been "bumped" back up to the "new" "unreleased" section.

The pending question there would be a good confirmation, but is mostly relevant for the current release wranglers of the 1.70.0 release, so they have clarity on where that note belongs.

@mkevins mkevins merged commit 93f8a1c into develop Jan 20, 2022
@mkevins mkevins deleted the merge_release_1.69.1_to_develop branch January 20, 2022 04:11
@mkevins
Copy link
Contributor Author

mkevins commented Jan 20, 2022

Thanks for reviewing @ttahmouch !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants