Skip to content

Forward-port 1.0 branch #38

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.

Sign up for GitHub

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

Merged
merged 12 commits into from
Apr 16, 2020
Merged

Forward-port 1.0 branch #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0630552
Fix syntax error on composer.json of Magento_Amqp (#25)
PhantomDraven Feb 18, 2020
c5bf339
MAGECLOUD-5359: Patches 1.0.2 fail on magento version 2.1.4 with php …
shiftedreality Feb 19, 2020
4a430e7
Merge branch '1.0' into develop-backport
shiftedreality Feb 25, 2020
00dc06e
Merge pull request #29 from magento/develop-backport
shiftedreality Feb 25, 2020
e19118f
MAGECLOUD-5472: Patch MAGECLOUD-5069__fpc_is_getting_disabled_during_…
dyushkin Mar 3, 2020
d823509
Merge branch '1.0' into MAGECLOUD-5472
oshmyheliuk Mar 4, 2020
f1f304f
Update composer.json
shiftedreality Mar 4, 2020
2a3e248
Merge pull request #30 from dyushkin/MAGECLOUD-5472
shiftedreality Mar 4, 2020
b4ab4c8
Merge branch '1.0' into shiftedreality-patch-1
shiftedreality Mar 4, 2020
7527aa6
Merge pull request #31 from magento/shiftedreality-patch-1
shiftedreality Mar 4, 2020
cd47596
Merge branch 'develop' into 1.0-forward
shiftedreality Apr 15, 2020
05453b0
Merge branch 'develop' into 1.0-forward
shiftedreality Apr 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"name": "magento/magento-cloud-patches",
"description": "Provides critical fixes for Magento 2 Enterprise Edition",
"type": "magento2-component",
"version": "1.0.1",
"version": "1.0.3",
"license": "OSL-3.0",
"require": {
"php": "^7.0",
"ext-json": "*",
"composer/composer": "@stable",
"composer/semver": "^1.5",
"symfony/config": "^3.3||^4.4",
"symfony/console": "^2.8||^4.0",
"symfony/console": "^2.6||^4.0",
Copy link
Contributor

@NadiyaS NadiyaS Apr 15, 2020

Choose a reason for hiding this comment

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

we downgraded min version?

Copy link
Member Author

@shiftedreality shiftedreality Apr 15, 2020

Choose a reason for hiding this comment

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

Yes, as part of fixing BC

"symfony/dependency-injection": "^3.3||^4.3",
"symfony/process": "^2.1||^4.1"
},
Expand Down
3 changes: 2 additions & 1 deletion patches.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,8 @@
"2.2.4": "MAGETWO-92926__fix_for_multi-site_configuration_issue__2.2.4.patch"
},
"FPC is getting disabled during deployments": {
">=2.3.2 <2.4.0": "MAGECLOUD-5069__fpc_is_getting_disabled_during_deployments__2.3.2.patch"
">=2.3.2 <2.3.5": "MAGECLOUD-5069__fpc_is_getting_disabled_during_deployments__2.3.2.patch",
">=2.3.5 <2.4.0": "MAGECLOUD-5069__fpc_is_getting_disabled_during_deployments__2.3.5.patch"
}
},
"magento/module-paypal": {
Expand Down
Loading