Push changes from master to staging on 2021-04-12 #2716
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
Add --follow-symlinks flag to sed commands for staging site (and deprecated dev site)
Added interaction text for Konstant Warrior
…eraction Added interaction text for Warrior Turbo and Warrior Konstant
Added images for The Fog and Tilili
Updated images for Kolat and Ninja
* Retry establishing the database connection a few times * In the worst case, catch exceptions in ApiResponder to avoid returning stacktraces
Handle database exceptions more cleanly
Support SSL on AWS-based buttonmen sites
Use an older version of grunt-cli to avoid micromatch version issue
Added images for classic fanatics
|
Merging, and will update staging site. |
|
Blah, so updating the staging site failed, because the older instances (staging and prod) don't have the ec2_placement_region tag in facter, but only ec2_placement_availability_zone |
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 update brings these approved pulls to the staging branch:
Database updates: none
Special actions needed:
Once this pull is merged, i will load the changes on staging.buttonweavers.com as part of #2715.