Skip to content

MAGECLOUD-5215: Forward-port delivered changes #20

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 15 commits into from
Feb 7, 2020
Merged

MAGECLOUD-5215: Forward-port delivered changes #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
bd0366b
Merge pull request #12 from magento/develop
shiftedreality Jan 7, 2020
9524c87
MAGECLOUD-4980: Pagebuilder patches fail CE functional tests (#14)
Jan 8, 2020
0a22b2a
Add v2.8 of Symfony packages
bbatsche Jan 9, 2020
b5937b7
MAGECLOUD-4982: De-composed magento-cloud-patches fail to apply locally
Jan 10, 2020
11e4fe7
Merge pull request #15 from magento/MAGECLOUD-4982
Jan 12, 2020
db90801
Minimize dependency set a bit
bbatsche Jan 10, 2020
e88f26b
Merge branch '1.0' into MAGECLOUD-4979
bbatsche Jan 13, 2020
f7806a6
Add legacy version of symfony/config for PHP 7.0
bbatsche Jan 13, 2020
7db5340
Add support for ^3.3 version of symfony/dependency-injection
bbatsche Jan 15, 2020
06f0896
Allow symfony/config 3.3 instead of 2.8
bbatsche Jan 16, 2020
6c5d8ce
MAGECLOUD-4979: Cleanup Composer Dependencies
Jan 17, 2020
5b5594d
MAGECLOUD-4530: Create patch for deadlocks related to crons / consume…
BaDos Jan 24, 2020
7a1bb07
Bump Composer version to 1.0.1
shiftedreality Jan 24, 2020
088d258
Merge pull request #18 from magento/shiftedreality-patch-1
shiftedreality Jan 24, 2020
32c6d82
Merge branch '1.0' of https://github.com/magento/magento-cloud-patche…
shiftedreality Feb 7, 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
9 changes: 6 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,21 @@
"name": "magento/magento-cloud-patches",
"description": "Provides critical fixes for Magento 2 Enterprise Edition",
"type": "magento2-component",
"version": "1.0.0",
"version": "1.0.1",
"license": "OSL-3.0",
"require": {
"php": "^7.0",
"ext-json": "*",
"composer/composer": "@stable",
"composer/semver": "^1.5",
"symfony/config": "^3.3||^4.3",
"symfony/console": "^2.6||^4.0",
"symfony/config": "^3.3||^4.4",
"symfony/console": "^2.8||^4.0",
"symfony/dependency-injection": "^3.3||^4.3",
"symfony/process": "^2.1||^4.1"
},
"conflict": {
"symfony/process": "^4.2"
},
"require-dev": {
"phpmd/phpmd": "@stable",
"phpunit/phpunit": "^6.2",
Expand Down
24 changes: 17 additions & 7 deletions patches.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
"2.2.0": "MDVA-8695__properly_encode_characters_in_emails__2.1.4.patch"
},
"Enable SCD on demand in production": {
">=2.1.4": "MAGECLOUD-1601__trim_static_content_path__2.1.4.patch",
"~2.1.4": "MAGECLOUD-1601__configure_scd_on_demand_for_cloud__2.1.4.patch",
"2.2.0 - 2.2.3": "MAGECLOUD-1601__configure_scd_on_demand_for_cloud__2.2.0.patch"
},
Expand All @@ -60,6 +59,15 @@
"2.2.2 - 2.2.3": "MAGECLOUD-1607__overhaul_cron_implementation__2.2.2.patch",
"2.2.4": "MAGECLOUD-1607__overhaul_cron_implementation__2.2.4.patch"
},
"Fix cron deadlocks and improve cron locking": {
"2.2.5 - 2.2.8": "MAGECLOUD-4530__fix_cron_deadlocks_and_improve_job_locking__2.2.5.patch",
"2.2.9": "MAGECLOUD-4530__fix_cron_deadlocks_and_improve_job_locking__2.2.9.patch",
">=2.2.10 <2.3.0": "MAGECLOUD-4530__fix_cron_deadlocks_and_improve_job_locking__2.2.10.patch",
"2.3.0": "MAGECLOUD-4530__fix_cron_deadlocks_and_improve_job_locking__2.3.0.patch",
"2.3.1": "MAGECLOUD-4530__fix_cron_deadlocks_and_improve_job_locking__2.3.1.patch",
">=2.3.2 <2.3.3": "MAGECLOUD-4530__fix_cron_deadlocks_and_improve_job_locking__2.3.2.patch",
">=2.3.3 <2.3.5": "MAGECLOUD-4530__fix_cron_deadlocks_and_improve_job_locking__2.3.3.patch"
},
"Add Zookeeper and flock locks": {
"2.2.5 - 2.2.8": "MAGECLOUD-3054__add_zookeeper_and_flock_locks__2.2.5.patch",
"2.3.0 - 2.3.1": "MAGECLOUD-3054__add_zookeeper_and_flock_locks__2.3.0.patch"
Expand Down Expand Up @@ -202,12 +210,6 @@
"2.3.1": "MAGECLOUD-3392__reduce_q-ty_of_error_report_files__2.3.1.patch",
">=2.3.2 <2.3.4": "MAGECLOUD-3392__reduce_q-ty_of_error_report_files__2.3.2.patch"
},
"Fix pagebuilder module": {
"2.3.1": "PB-319__fix_pagebuilder_module__2.3.1.patch",
"2.3.2": "PB-320__fix_pagebuilder_module__2.3.2.patch",
">=2.3.2-p1 <2.3.3": "PB-322__fix_pagebuilder_module__2.3.2-p1.patch",
"2.3.3": "PB-323__fix_pagebuilder_module__2.3.3.patch"
},
"Fix XSS in order history": {
"2.2.0 - 2.2.6": "PRODSECBUG-2233__fix_xss_in_order_history__2.2.0.patch",
"2.2.7 - 2.2.8": "PRODSECBUG-2233__fix_xss_in_order_history__2.2.7.patch",
Expand Down Expand Up @@ -287,5 +289,13 @@
"Fix wrong namespace": {
"3.2.0": "MAGECLOUD-4407__fix_namespace_vertex_tax__3.2.0.patch"
}
},
"magento/magento2-ee-base": {
"Fix pagebuilder module": {
"2.3.1": "PB-319__fix_pagebuilder_module__2.3.1.patch",
"2.3.2": "PB-320__fix_pagebuilder_module__2.3.2.patch",
">=2.3.2-p1 <2.3.3": "PB-322__fix_pagebuilder_module__2.3.2-p1.patch",
"2.3.3": "PB-323__fix_pagebuilder_module__2.3.3.patch"
}
}
}
11 changes: 0 additions & 11 deletions patches/MAGECLOUD-1601__trim_static_content_path__2.1.4.patch
View file
Open in desktop

This file was deleted.

Loading