Skip to content

Sync master -> staging#1086

Merged
0xdevalias merged 23 commits into
stagingfrom
devalias/sync-master-staging
Jan 22, 2021
Merged

Sync master -> staging#1086
0xdevalias merged 23 commits into
stagingfrom
devalias/sync-master-staging

Conversation

@0xdevalias

@0xdevalias 0xdevalias commented Jan 22, 2021

Copy link
Copy Markdown
Contributor

(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 to staging to keep the branches aligned:

0xdevalias and others added 22 commits December 5, 2020 19:31
Deploy - Prevent loops in account creation (#934)
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
@0xdevalias 0xdevalias self-assigned this Jan 22, 2021
@0xdevalias

0xdevalias commented Jan 22, 2021

Copy link
Copy Markdown
Contributor Author

@mike-lvov if we do hotfix changes directly to master in future (which I would like to avoid the situations where we need to in the first place), please make sure you sync them back to staging straight away afterwards to avoid situations like the conflicts here.

Comment thread src/hooks/useSparkleFirestoreConnect.ts Outdated
@0xdevalias 0xdevalias force-pushed the devalias/sync-master-staging branch from 7ec3711 to 503595a Compare January 22, 2021 04:36
@0xdevalias 0xdevalias force-pushed the devalias/sync-master-staging branch from 503595a to bce6594 Compare January 22, 2021 04:39
@0xdevalias 0xdevalias force-pushed the devalias/sync-master-staging branch from bce6594 to 4504711 Compare January 22, 2021 04:43
@0xdevalias 0xdevalias force-pushed the devalias/sync-master-staging branch from 4504711 to eaa8b19 Compare January 22, 2021 04:46
@0xdevalias 0xdevalias force-pushed the devalias/sync-master-staging branch from eaa8b19 to 22a65e4 Compare January 22, 2021 04:47
@qlty-cloud-legacy

Copy link
Copy Markdown

Code Climate has analyzed commit 22a65e4 and detected 0 issues on this pull request.

View more on Code Climate.

@0xdevalias 0xdevalias left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[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?

@0xdevalias 0xdevalias added the 🔨🍷 break-glass-approval-bypass Used to show that a 'break glass' approval bypass was used on this PR label Jan 22, 2021
@0xdevalias 0xdevalias merged commit 22589c0 into staging Jan 22, 2021
@0xdevalias 0xdevalias deleted the devalias/sync-master-staging branch January 22, 2021 04:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🔨🍷 break-glass-approval-bypass Used to show that a 'break glass' approval bypass was used on this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants