Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a3ba7be
MAGECLOUD-4458: De-compose All Patches from ECE-Tools
shiftedreality Oct 22, 2019
89bdf3f
MAGECLOUD-4458: De-compose All Patches from ECE-Tools
shiftedreality Oct 22, 2019
e5bdf25
MAGECLOUD-4458: De-compose All Patches from ECE-Tools
shiftedreality Oct 23, 2019
d6c171b
MAGECLOUD-4458: De-compose All Patches from ECE-Tools
shiftedreality Oct 23, 2019
b8227b5
MAGECLOUD-4458: De-compose All Patches from ECE-Tools
shiftedreality Oct 23, 2019
355cacd
MAGECLOUD-4458: De-compose All Patches from ECE-Tools
shiftedreality Oct 23, 2019
6719a55
MAGECLOUD-4458: De-compose All Patches from ECE-Tools
shiftedreality Oct 23, 2019
83193b0
MAGECLOUD-4458: De-compose All Patches from ECE-Tools
shiftedreality Oct 23, 2019
d36af0d
MAGECLOUD-4458: De-compose All Patches from ECE-Tools
shiftedreality Oct 23, 2019
c2d0695
MAGECLOUD-4458: De-compose All Patches from ECE-Tools
shiftedreality Oct 23, 2019
720ab58
MAGECLOUD-4458: De-compose All Patches from ECE-Tools
shiftedreality Oct 23, 2019
e0ed1f0
MAGECLOUD-4458: De-compose All Patches from ECE-Tools
shiftedreality Oct 23, 2019
f7e0dfe
MAGECLOUD-4458: De-compose All Patches from ECE-Tools
shiftedreality Oct 24, 2019
60f0628
MAGECLOUD-4458: De-compose All Patches from ECE-Tools
shiftedreality Oct 24, 2019
ddbce9c
MAGECLOUD-4458: De-compose All Patches from ECE-Tools
shiftedreality Oct 24, 2019
973662f
MAGECLOUD-4458: De-compose All Patches from ECE-Tools
shiftedreality Oct 25, 2019
5b2c14a
MAGECLOUD-4458: De-compose All Patches from ECE-Tools
shiftedreality Oct 29, 2019
8adb741
MAGECLOUD-4458: De-compose All Patches from ECE-Tools
shiftedreality Oct 29, 2019
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
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,14 @@ install:
- if [ $TRAVIS_SECURE_ENV_VARS != "true" ]; then composer remove magento/magento-cloud-components --no-update; fi;
- if [ $TRAVIS_SECURE_ENV_VARS != "true" ]; then composer config --unset repositories.repo.magento.com; fi;
- if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then composer config http-basic.repo.magento.com ${REPO_USERNAME} ${REPO_PASSWORD}; fi;
- if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then composer config github-oauth.github.com ${GITHUB_TOKEN}; fi;
- if [ -n "${MCP_VERSION}" ]; then composer config repositories.mcp git git@github.com:magento/magento-cloud-patches.git && composer require "magento/magento-cloud-patches:${MCP_VERSION}" --no-update; fi;
- composer update -n --no-suggest

before_script:
- echo "COMPOSER_MAGENTO_USERNAME=${REPO_USERNAME}" >> ./.docker/composer.env
- echo "COMPOSER_MAGENTO_PASSWORD=${REPO_PASSWORD}" >> ./.docker/composer.env
- echo "COMPOSER_GITHUB_TOKEN=${GITHUB_TOKEN}" >> ./.docker/composer.env
- if [ $XDEBUG == "true" ]; then echo "PHP_ENABLE_XDEBUG=true" >> ./.docker/global.env; fi;
- sudo /etc/init.d/mysql stop
- ./tests/travis/prepare_functional_parallel.sh
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"symfony/process": "~2.1||~4.1.0",
"symfony/yaml": "^3.3||^4.0",
"twig/twig": "^1.0||^2.0",
"magento/magento-cloud-components": "^1.0.1"
"magento/magento-cloud-components": "^1.0.1",
"magento/magento-cloud-patches": "^1.0.0"
},
"require-dev": {
"php-mock/php-mock-phpunit": "^2.0",
Expand Down
230 changes: 0 additions & 230 deletions patches.json

This file was deleted.

This file was deleted.

24 changes: 0 additions & 24 deletions patches/MAGECLOUD-1582__fix_session_manager_locking__2.1.10.patch

This file was deleted.

24 changes: 0 additions & 24 deletions patches/MAGECLOUD-1582__fix_session_manager_locking__2.2.0.patch

This file was deleted.

Loading