Skip to content
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

Merge develop into 2002.0 #112

Merged
merged 45 commits into from
Dec 5, 2017
Merged

Merge develop into 2002.0 #112

merged 45 commits into from
Dec 5, 2017

Conversation

shiftedreality
Copy link
Member

@shiftedreality shiftedreality commented Dec 5, 2017 •
edited
Loading

Description

Delivering changes from develop branch into the stable.

Contribution checklist

  • Pull request has a meaningful description of its purpose
  • Pull request was approved by architect
  • Pull request was approved by QA member
  • 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 30 commits October 20, 2017 17:42
@shiftedreality
MAGECLOUD-1127: Add upgrade tests (#56)
f4d8de1
@shiftedreality
MAGECLOUD-1152: No exception on patching error
1585ff5
@shiftedreality
Merge pull request #60 from magento-thunder/MAGECLOUD-1152
fec764b 
MAGECLOUD-1152: No exception on patching error
@ngeron @shiftedreality
MAGECLOUD-1089: Automatically handle missing config.php and freshly i…
96eedba 
…nstalled modules (#55)
@shiftedreality
MAGECLOUD-1123: Refactor ConfigDump command (#53)
16c5907
@michaelcasey316 @shiftedreality
MAGECLOUD-1069: Static content compression (#58)
1d4c207
Replacing http:// with https:// for the secure url
4e81bd8
@shiftedreality
MAGECLOUD-1081: Disable overwritten of cloud.log file during every re…
0c5efff 
…deploy (#48)
@oshmyheliuk @shiftedreality
MAGECLOUD-1138: HTML minification is not working as expected (#61)
29df844
@shiftedreality
MAGECLOUD-1193: Enable strict errors (#71)
979a25c
@shiftedreality
Merge pull request #65 from magento-cloud/MAGECLOUD-1171
f22fd7f
@shiftedreality
MAGECLOUD-1113: Automate Zephyr test MAGETWO-80875 (#75)
5d67d9a
@oshmyheliuk @shiftedreality
MAGECLOUD-1159: Replace all hardcoded config filenames and directories (
7480c23 
#76)
@oshmyheliuk @shiftedreality
MAGECLOUD-1088: Scan configuration before build / deploy (#47)
c97819f
@shiftedreality
Merge branch '2002.0' of https://github.com/magento/ece-tools into MA…
b1e91b9 
…GECLOUD-1196

# Conflicts:
#	src/Process/Build/ApplyPatches.php
#	src/StaticContent/Build/Option.php
#	src/Test/Unit/Process/Build/ApplyPatchesTest.php
#	src/Test/Unit/StaticContent/Build/OptionTest.php
@shiftedreality
MAGECLOUD-1205: Introduce Docker environment (#77)
3b79e42
@billygilbert @shiftedreality
MAGECLOUD-1182: Setting unsecure URL to Secure URL if one is not prov…
4e5747e 
…ided (#73)
@shiftedreality
Merge pull request #84 from magento-thunder/MAGECLOUD-1196
0ca9ffd
@shiftedreality
MAGECLOUD-1203: Different logging systems support (#80)
145a2d7
@shiftedreality
MAGECLOUD-1266: Remove composer cache from Docker volumes
b31e1d7
@shiftedreality
Merge pull request #93 from magento-thunder/MAGECLOUD-1266
f013f43 
MAGECLOUD-1266: Remove composer cache from Docker volumes
@oshmyheliuk
MAGECLOUD-1264: Shell stderr is not logged when CLI command returns n…
317af08 
…on zero code (#89)

* MAGECLOUD-1264: Shell stderr is not logged when CLI command returns non zero code

* MAGECLOUD-1264: Shell stderr is not logged when CLI command returns non zero code

* MAGECLOUD-1264: Shell stderr is not logged when CLI command returns non zero code

* MAGECLOUD-1264: Shell stderr is not logged when CLI command returns non zero code

* MAGECLOUD-1264: Shell stderr is not logged when CLI command returns non zero code

* MAGECLOUD-1264: Shell stderr is not logged when CLI command returns non zero code

* MAGECLOUD-1264: Shell stderr is not logged when CLI command returns non zero code

* MAGECLOUD-1264: Shell stderr is not logged when CLI command returns non zero code

* MAGECLOUD-1264: Shell stderr is not logged when CLI command returns non zero code
@shiftedreality
MAGECLOUD-1254: Implement Post-Open Hook to Run Operations After Depl…
16aa0f0 
…oyment (#91)
@shiftedreality
MAGECLOUD-1284: Add code coverage check to Travis CI (#95)
2958220
@shiftedreality
MAGECLOUD-1295: Create documentation on ECE infrastructure automated …
a587114 
…testing (#96)
@oshmyheliuk @shiftedreality
MAGECLOUD-1252: Symlink var/view_preprocessed (#92)
d150747
@shiftedreality
Merge branch '2002.0' of https://github.com/magento/ece-tools into MA…
30192d2 
…GECLOUD-1320
@shiftedreality
Merge pull request #98 from magento-thunder/MAGECLOUD-1320
cdb40bb
@shiftedreality
MAGECLOUD-1322: ECE-Tools does not provide definition for BP
c499ecb
@shiftedreality
Merge pull request #99 from magento-thunder/MAGECLOUD-1322
f0b6f67
Yevhen Miroshnychenko and others added 15 commits November 28, 2017 13:49
MAGECLOUD-1327: Move cache clean operation in deploy phase to the ver…
68f7fb0 
…y end
@shiftedreality
Merge pull request #101 from magento-thunder/MAGECLOUD-1327
c388a53
@NadiyaS @shiftedreality
MAGECLOUD-343: Method for exporting a DB Backup of production site (#94)
4bac8fe
@shiftedreality
Merge branch '2002.0' of https://github.com/magento/ece-tools into MA…
d3dfd5d 
…GECLOUD-1348

# Conflicts:
#	src/App/Container.php
@shiftedreality
Merge branch '2002.0' of https://github.com/magento/ece-tools into MA…
d44abdc 
…GECLOUD-1348

# Conflicts:
#	src/App/Container.php
@shiftedreality
Merge pull request #105 from magento-thunder/MAGECLOUD-1348
823b5a3 
MAGECLOUD-1348: Merge 2002.0 branch into develop
@shiftedreality
MAGECLOUD-1332: Add ability to configure cron_consumers_runner via an…
7ab28d5 
… environment variable (#102)
@oshmyheliuk
MAGECLOUD-1362: view_preprocessed is a file not a directory
ece6912
@shiftedreality
MAGECLOUD-1349: Add possibility to disable static content compression (…
2f3c443 
…#106)
@NadiyaS @shiftedreality
MAGECLOUD-1361: Ask confirmation before running db-dump command (#110)
1a835b0
@shiftedreality
Merge pull request #109 from magento-thunder/MAGECLOUD-1362
a978952 
MAGECLOUD-1362: view_preprocessed is a file not a directory
@shiftedreality
MAGECLOUD-1364: Merge 2002.0 branch into develop
9429cc5
@shiftedreality
MAGECLOUD-1364: Merge 2002.0 branch into develop
99c94d8
@shiftedreality
Merge pull request #111 from magento-thunder/MAGECLOUD-1364
4735164 
MAGECLOUD-1364: Merge 2002.0 branch into develop
@shiftedreality
MAGECLOUD-1242: [Magento Cloud] - Base url after forking no longer se…
ba35173 
…ems to be update (#100)
@shiftedreality
Copy link
Member Author

QA is not needed.
Architect approve is not needed.

@shiftedreality shiftedreality added Progress: accept PR/issue status and removed Progress: accept PR/issue status labels Dec 5, 2017
@shiftedreality shiftedreality merged commit 603817a into 2002.0 Dec 5, 2017
magento-devops-reposync-svc pushed a commit that referenced this pull request Mar 7, 2023
@BaDos
Merge pull request #112 from magento-commerce/develop
6067107 
MCLOUD-10080 Release Cloud Tools
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@shiftedreality @YPyltiai @ngeron @michaelcasey316 @oshmyheliuk @billygilbert @NadiyaS