Changes from upstream Magento release 2.4.7-p4#121
Merged
rhoerr merged 5 commits intomage-os:release/1.xfrom Feb 13, 2025
Merged
Changes from upstream Magento release 2.4.7-p4#121rhoerr merged 5 commits intomage-os:release/1.xfrom
rhoerr merged 5 commits intomage-os:release/1.xfrom
Conversation
fballiano
reviewed
Feb 12, 2025
fballiano
reviewed
Feb 12, 2025
Contributor
Author
|
Note: I've run the full integration test suite at https://github.com/rhoerr/mageos-magento2/actions/runs/13289101304 .
IMO in both cases these issues should be fixed so the tests pass, but shouldn't block us pushing the 1.0.6 release. |
Contributor
|
@Vinai @sprankhub could you give this one a check? |
Contributor
Author
|
Francis Gallagher reviewed on MageChat and says it looks good (nothing notably missed). He suggested diffing commits/tags directly, which I did as well to confirm that. I'm running another test suite at https://github.com/rhoerr/mageos-magento2/actions/runs/13296916454. Will give that 30 mins; assuming that looks good, I'll merge and then do a preview release. |
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
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.
Description (*)
This PR pulls the changes from 2.4.7-p4 vs 2.4.7-p3 onto release/1.x. This brings it in line with 2.4.7-p4 for our next release.
I sourced the change list from https://github.com/magento/magento2/compare/2.4.7-p3..2.4.7-p4 with all composer.json changes removed, and merge conflicts resolved via PhpStorm.