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

Jump to bottom
Merged
merged 15 commits into from
Feb 7, 2020
Merged

MAGECLOUD-5215: Forward-port delivered changes #20

merged 15 commits into from
Feb 7, 2020

Conversation

@shiftedreality
Copy link
Member

@shiftedreality shiftedreality commented Feb 7, 2020 •
edited
Loading

Description

Forward-port of delivered features.

Contribution checklist

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds on Travis CI are green)

shiftedreality and others added 15 commits January 7, 2020 13:28
@shiftedreality
Merge pull request #12 from magento/develop
bd0366b 
Merge develop into 1.0
@shiftedreality
MAGECLOUD-4980: Pagebuilder patches fail CE functional tests (#14)
9524c87
@bbatsche
Add v2.8 of Symfony packages
0a22b2a
MAGECLOUD-4982: De-composed magento-cloud-patches fail to apply locally
b5937b7
Merge pull request #15 from magento/MAGECLOUD-4982
11e4fe7 
MAGECLOUD-4982: De-composed magento-cloud-patches fail to apply locally
@bbatsche
Minimize dependency set a bit
db90801
@bbatsche
Merge branch '1.0' into MAGECLOUD-4979
e88f26b
@bbatsche
Add legacy version of symfony/config for PHP 7.0
f7806a6
@bbatsche
Add support for ^3.3 version of symfony/dependency-injection
7db5340
@bbatsche
Allow symfony/config 3.3 instead of 2.8
06f0896
MAGECLOUD-4979: Cleanup Composer Dependencies
6c5d8ce 
MAGECLOUD-4979: Cleanup Composer Dependencies
@BaDos @shiftedreality
MAGECLOUD-4530: Create patch for deadlocks related to crons / consume…
5b5594d 
…rs (#17)
@shiftedreality
Bump Composer version to 1.0.1
7a1bb07
@shiftedreality
Merge pull request #18 from magento/shiftedreality-patch-1
088d258 
Bump Composer version to 1.0.1
@shiftedreality
Merge branch '1.0' of https://github.com/magento/magento-cloud-patches …
32c6d82 
…into MAGECLOUD-5215

� Conflicts:
�	composer.json
@shiftedreality shiftedreality added the Progress: approved PR/issue status label Feb 7, 2020
@shiftedreality shiftedreality merged commit 1da64c2 into develop Feb 7, 2020
@shiftedreality shiftedreality deleted the MAGECLOUD-5215 branch February 7, 2020 16:21
magento-cicd2 pushed a commit that referenced this pull request May 11, 2021
@oshmyheliuk
Merge pull request #20 from magento-commerce/develop
3d3d6aa 
Merge develop into 1.0
andriyShevtsov pushed a commit that referenced this pull request Sep 8, 2025
@shiftedreality
Merge pull request #20 from magento/MAGECLOUD-5215
3966006 
MAGECLOUD-5215: Forward-port delivered changes
andriyShevtsov pushed a commit that referenced this pull request Sep 8, 2025
@oshmyheliuk
Merge pull request #20 from magento-commerce/develop
a54fb26 
Merge develop into 1.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@oshmyheliuk oshmyheliuk oshmyheliuk approved these changes

@billygilbert billygilbert billygilbert approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Progress: approved PR/issue status

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@shiftedreality @oshmyheliuk @billygilbert @bbatsche @BaDos