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/25.4 into trunk #23628

Merged
merged 5 commits into from
Sep 27, 2024
Merged

Merge release/25.4 into trunk #23628

merged 5 commits into from
Sep 27, 2024

Conversation

wpmobilebot
Copy link
Contributor

Merging release/25.4 into trunk.

Via intermediate branch merge/release-25.4-into-trunk, to help fix conflicts if any:

                            release/25.4  ----o-- - - -
                                               \
           merge/release-25.4-into-trunk        `---.
                                                     \
                                   trunk  ------------x- - -

@wpmobilebot wpmobilebot added this to the 25.5 milestone Sep 26, 2024
@dangermattic
Copy link
Collaborator

1 Message
📖 This PR has the Releases label: some checks will be skipped.

Generated by 🚫 Danger

@wpmobilebot
Copy link
Contributor Author

WordPress Alpha📲 You can test the changes from this Pull Request in WordPress Alpha by scanning the QR code below to install the corresponding build.
App NameWordPress Alpha WordPress Alpha
ConfigurationRelease-Alpha
Build Numberpr23628-6b0fac6
Version25.4
Bundle IDorg.wordpress.alpha
Commit6b0fac6
App Center BuildWPiOS - One-Offs #10741
Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

@wpmobilebot
Copy link
Contributor Author

Jetpack Alpha📲 You can test the changes from this Pull Request in Jetpack Alpha by scanning the QR code below to install the corresponding build.
App NameJetpack Alpha Jetpack Alpha
ConfigurationRelease-Alpha
Build Numberpr23628-6b0fac6
Version25.4
Bundle IDcom.jetpack.alpha
Commit6b0fac6
App Center Buildjetpack-installable-builds #9784
Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

@oguzkocer oguzkocer merged commit d3e4988 into trunk Sep 27, 2024
19 of 27 checks passed
@oguzkocer oguzkocer deleted the merge/release-25.4-into-trunk branch September 27, 2024 01:07
jkmassel added a commit that referenced this pull request Oct 2, 2024
* Merge release/25.4 into trunk (#23628)

* Bump version number

* Update draft release notes for 25.4.

* Update draft release notes for 25.4.

* Release Notes: add new section for next version (25.5)

* Update strings for localization

* feat: Persist GutenbergKit changes

Ensure post changes are not lost.

* fix: Persist changes if either post title or content changes

The previous conditional erroneously ignored changes unless both values
changed.

* build: Update GutenbergKit ref

* fix: Improve empty editor content check

As noted in the code comment, this value lags behind reality. A race
condition existed in production builds cause inaccurate values. This was
removed to instead rely upon the existing `editorHasContent`
implementation found in the `PostEditor` class.

* build: Update GutenbergKit ref

* build: Update GutenbergKit ref

* build: Update GutenbergKit ref

* Update GutenbergKit ref

* Update GutenbergKit ref

---------

Co-authored-by: WordPress Mobile Bot Account <[email protected]>
Co-authored-by: Gerardo <[email protected]>
Co-authored-by: Jeremy Massel <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants