Merge upstream 1.7.6 ancestor (3497c4ccc) into release/3.x#12
Merged
Conversation
PageBuilder Github Automation
… doesn't have Widget permission
…op-sync-14012025 Cia pre release develop sync 14012025
… doesn't have Widget permission
… doesn't have Widget permission
…op-sync-04282025 Cia pre release develop sync 04282025
- Fixed Static tests
AC-16668::Static Tests are failing on 2.4.9-develop sync PR
…op-sync-24032026 Cia pre release develop sync 24032026
…x-03302026 Cia pre release bugfix 03302026
…01_muntianu [Support Tier-4 muntianu] 04-01-2026 Regular delivery of bugfixes and improvements
…op-sync-09042026 Cia pre release develop sync 09042026
…ated when reopening the widget dialog in PageBuilder
…ated when reopening the widget dialog in PageBuilder
AC-16791: Widget anchor text/title containing double quotes are trunc…
… view after removing image when one exists on All Store Views
… view after removing image when one exists on All Store Views
… view after removing image when one exists on All Store Views
AC-16922: Category image upload button not clickable on default store…
Security changes from upstream 1.7.5-p5
# Conflicts: # app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/EditPanelFormSection.xml # app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTextSection/TextOnStageSection.xml # app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGOnPageBuilderInlineSection.xml # app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderHTMLThroughBlockContentTypeTest.xml # app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileHTMLThroughBlockContentTypeTest.xml # app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_config.less # app/code/Magento/PageBuilder/view/adminhtml/web/js/wysiwyg/tinymce.js
…ty changes) # Conflicts: # app/code/Magento/PageBuilder/i18n/en_US.csv
marcelmtz
approved these changes
May 15, 2026
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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.
Summary
Merges upstream Magento page-builder commit
3497c4ccc(Merge PR magento#528 from magento-gl/AC-16922-V1) — a clean ancestor of the upstream1.7.6release tag with no version pins or intermediate version-setter residue — intorelease/3.x.This brings the Mage-OS
release/3.xline up to the upstream 1.7.6 codebase while preserving Mage-OS-specific commits already on the branch:Magento_CMS(Update TinyMCE config to match Magento_CMS config #4)composer.jsonanalytics modules removal (Update composer.json to remove analytics modules #10)Conflicts resolved
7 conflicts, all non-substantive (license headers, copyright years, formatting, and a HugeRTE-aware MFTF selector). All resolved by taking the upstream version since they reflect upstream evolution rather than Mage-OS-specific changes:
Test/Mftf/Section/PageBuilderEditFormSection/EditPanelFormSection.xml— copyright yearTest/Mftf/Section/PageBuilderTextSection/TextOnStageSection.xml— copyright yearTest/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGOnPageBuilderInlineSection.xml—tableMenuFirstItemselector updated for HugeRTE/tox-classesTest/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderHTMLThroughBlockContentTypeTest.xml— license header styleTest/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileHTMLThroughBlockContentTypeTest.xml— license header styleview/adminhtml/web/css/source/_config.less— LESS formattingview/adminhtml/web/js/wysiwyg/tinymce.js— whitespace before sourceMappingURLTest plan
git log release/3.x..chore/upstream-merge-3497c4cshould show the merge commit; preserved Mage-OS commits visible inrelease/3.xhistory)🤖 Generated with Claude Code