Third round of upstream changes from Pantheon #135
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#60) CMS-1112: Resolves issue where updates to commit choosing logic were causing a merge conflict.
This update to the WordPress (Composer Managed) upstream disables Dependabot dependency management notifications (we do not want to change the versions of dependencies in our composer.json file for risk of merge conflicts). This update also resolves an issue that was causing releases to not deploy to the Decoupled WordPress (Composer Managed) upstream.
* add final-ish sage install script * make the script executable * add the install sage script * document how to install sage this just gives the script and links to the installing sage doc * add base install doc * set process timeout to 0 so our script can complete * remove sort packages that might change things and cause merge conflicts * update docs * add final note about multiple sage themes * also add note about symlinks * fix link to screenshot * Capitalize Composer Co-authored-by: John Spellman <john.spellman@pantheon.io> Co-authored-by: John Spellman <john.spellman@pantheon.io>
This update adds an install script (located in /private/scripts and accessible via Composer) that can assist in installing the Roots Sage theme on new WordPress (Composer Managed) sites. Documentation can be found in the README.md file and in the Installing Sage doc in /docs. This update also disables the Dependabot dependency management notifications (we do not want to change the versions of dependencies in our composer.json file for risk of merge conflicts). Finally, this update resolves an issue that was causing releases to not deploy to the Decoupled WordPress (Composer Managed) upstream.
This update adds an install script (located in /private/scripts and accessible via Composer) that can assist in installing the Roots Sage theme on new WordPress (Composer Managed) sites. Documentation can be found in the README.md file and in the Installing Sage doc in /docs. This update also disables the Dependabot dependency management notifications (we do not want to change the versions of dependencies in our composer.json file for risk of merge conflicts). Finally, this update resolves an issue that was causing releases to not deploy to the Decoupled WordPress (Composer Managed) upstream.
This update adds an install script (located in /private/scripts and accessible via Composer) that can assist in installing the Roots Sage theme on new WordPress (Composer Managed) sites. Documentation can be found in the README.md file and in the Installing Sage doc in /docs. This update also disables the Dependabot dependency management notifications (we do not want to change the versions of dependencies in our composer.json file for risk of merge conflicts). Finally, this update resolves an issue that was causing releases to not deploy to the Decoupled WordPress (Composer Managed) upstream.
* DB-5248: add composer patches plugin * DB-5248: exit on patch failure
The Composer Patches plugin provides a way to patch any required Composer package from a local or remote file. This brings the WordPress (Composer Managed) upstream in line with the existing Drupal (Composer Managed) upstream which also supports Composer Patches. You can learn more about Composer Patches here: https://github.com/cweagans/composer-patches
The Composer Patches plugin provides a way to patch any required Composer package from a local or remote file. This brings the WordPress (Composer Managed) upstream in line with the existing Drupal (Composer Managed) upstream which also supports Composer Patches. You can learn more about Composer Patches here: https://github.com/cweagans/composer-patches
* break out the conditional to be more explicit this if statement was failing when it was all on one line. Breaking it out has the result of actually accomplishing what is intended in the code * fix skip check previously we were skipping everything * fixes an unbound variable error * accept incoming code from cherry pick * Be explicit in our check vs $skip Co-authored-by: Phil Tyler <philip@tylerdigital.com> --------- Co-authored-by: Phil Tyler <philip@tylerdigital.com>
* break out the conditional to be more explicit this if statement was failing when it was all on one line. Breaking it out has the result of actually accomplishing what is intended in the code * fix skip check previously we were skipping everything * fixes an unbound variable error * accept incoming code from cherry pick * Be explicit in our check vs $skip Co-authored-by: Phil Tyler <philip@tylerdigital.com> --------- Co-authored-by: Phil Tyler <philip@tylerdigital.com>
…ser-managed into default
* Add CMS Platform to CODEOWNERS * Update CODEOWNERS Co-authored-by: Phil Tyler <philip@tylerdigital.com> --------- Co-authored-by: Phil Tyler <philip@tylerdigital.com>
matt-bernhardt
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is the beginning of applying updates to our WordPress network. Subsequent commits to the
catch3branch will add some documentation for this process, and allow the review app to be used to confirm that these changes behave as expected.(Merging this without review, as the final merge into
masteris still ahead)