Sync master -> staging#1086
Merged
Merged
Conversation
Deploy 20201208
Deploy 20201208(2)
Deploy - Prevent loops in account creation (#934)
Deploy 20201209
Deploy - Multi-environment bits and pieces, chat performance, redirect if profile is incomplete
Deploy - flatMap and chat fixes, sync sparkle1
Entrance Experience Customisations (#992)
If hostname is not same as redirectUrl, redirect user (#1013)
* Fixes chats fetching, removed by chat context removal
Contributor
Author
|
@mike-lvov if we do hotfix changes directly to |
7ec3711 to
503595a
Compare
503595a to
bce6594
Compare
bce6594 to
4504711
Compare
4504711 to
eaa8b19
Compare
eaa8b19 to
22a65e4
Compare
|
Code Climate has analyzed commit 22a65e4 and detected 0 issues on this pull request. View more on Code Climate. |
0xdevalias
commented
Jan 22, 2021
Contributor
Author
There was a problem hiding this comment.
[CRO] the differences here seem like we aren't losing any relevant changes from staging now, though they are so minimal that i'm not actually sure what we gained by making #1059 directly against master. Perhaps it's that we have since re-fixed a lot of that stuff manually in staging anyway?
This was referenced Jan 22, 2021
This file contains hidden or 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
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.
(note: this is a re-creation of #1085 so I can fix the conflicts on a branch that isn't
master)Syncs the following changes in
master(including 'direct to master hotfixes' such as #1059) back tostagingto keep the branches aligned: