Merge/release 21.8 finalized into trunk #20243
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…21.7.2-into-release-21.8 Got conflicts in the `config/Version.*.xcconfig` files. Resolved them, as usual for hotfixes going into release branches, via `git checkout --theirs` to keep the release branch version of the files.
…elease_1.89.1 Integrate gutenberg-mobile release 1.89.1
Got conflicts in `Podfile` and `Podfile.lock` because both branches updated Gutenberg. I addressed them with `git checkout --theirs` to keep the version from `trunk`, then run `bundle exec pod install` to ensure the lockfile was entirely up to date.
mokagio
commented
Mar 3, 2023
mokagio
commented
Mar 3, 2023
| @@ -15,6 +15,7 @@ | |||
| * [*] Reader: Add ability to block a followed site. [#20053] | |||
| * [*] Reader: Add ability to report a post's author. [#20064] | |||
| * [*] [internal] Refactored the topic related features in the Reader tab (i.e. following, unfollowing, and search). [#20150] | |||
| * [*] Fix inaccessible block settings within the unsupported block editor [https://github.com/WordPress/gutenberg/pull/48435] | |||
There was a problem hiding this comment.
Generated by 🚫 dangerJS |
You can test the changes in WordPress from this Pull Request by:
|
You can test the changes in Jetpack from this Pull Request by:
|
oguzkocer
approved these changes
Mar 3, 2023
|
Closing in favor of #20254. Thank you @oguzkocer for the prompt review, which I'll use as validation to admin-merge the new PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Includes:
Release checks
release_notes.txtupdates.stringsupdates.xcconfigfile