Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

MM-28716: expose textbox's openWhenEmpty (#6460) #6553

Merged
merged 3 commits into from
Sep 28, 2020
Merged

MM-28716: expose textbox's openWhenEmpty (#6460) #6553

merged 3 commits into from
Sep 28, 2020

Conversation

lieut-data
Copy link
Member

Summary

Cherry picks a change supporting incident response to cloud:

  • expose openWhenEmpty on textbox
  • handle no active channel when in backstage

Ticket Link

Fixes: https://mattermost.atlassian.net/browse/MM-29007
Relates-to: https://mattermost.atlassian.net/browse/MM-28716

@lieut-data
MM-28716: expose textbox's openWhenEmpty (#6460)
682d585 
* expose openWhenEmpty on textbox

* handle no active channel when in backstage
@lieut-data lieut-data added the 2: Dev Review Requires review by a core commiter label Sep 24, 2020
@marianunez
Copy link
Member

@lieut-data Heads up that the cloud-beta branch has diverged somewhat from master so you may need to manually update some things for the tests to pass. Specifically some dependencies changes were done in master that have caused some issues with snapshots - see https://community-daily.mattermost.com/private-core/pl/f91b4qssnbybzgydxxxpuk8i4y

Can we also have a QA Review on this PR before merging? I know this is a cherry-pick but given that we still don't have a full RC testing on Cloud Beta let's make sure this change is happy in this branch first.

@lieut-data lieut-data added the 3: QA Review Requires review by a QA tester label Sep 24, 2020
@lieut-data
Copy link
Member Author

Really great context, @marianunez -- thank you! Is there a plan to bring cloud-beta back in sync with master? If that's happening relatively soon, I could just abandon this cherry-pick and wait until then since these changes aren't, strictly speaking, urgent.

@marianunez
Copy link
Member

Is there a plan to bring cloud-beta back in sync with master?

There is no plan to bring back in sync with master for the beta period. When we launch Soft GA (Oct 16th) we will be switching to master (or the new production one for continuous delivery).

lieut-data and others added 2 commits September 25, 2020 10:18
@lieut-data
patch snapshots for cloud-beta
d0e2462
@mattermost-build @iomodo @lieut-data
Fix autocomplete in DM (#6233) (#6408)
76c531e 
Co-authored-by: Mattermod <[email protected]>
(cherry picked from commit 50179c8)

Co-authored-by: Shota Gvinepadze <[email protected]>
@lieut-data
Copy link
Member Author

Thanks, @marianunez! I've patched the snapshots, as well as cherry-picked #6233 on which my PR was apparently dependent. I've also queued this up for QA Review once it passes dev review.

@cpoile cpoile removed the 2: Dev Review Requires review by a core commiter label Sep 28, 2020
@cpoile cpoile requested a review from prapti September 28, 2020 14:01
@amyblais
Copy link
Member

@prapti We're planning to push a new release of cloud beta tomorrow morning and this PR could make it in. Please help prioritize reviewing this today.

@prapti prapti added Setup Cloud Test Server Setup a test server using Mattermost Cloud and removed Setup Cloud Test Server Setup a test server using Mattermost Cloud labels Sep 28, 2020
@mm-cloud-bot
Copy link

Test server destroyed

prapti
prapti approved these changes Sep 28, 2020
View reviewed changes
Copy link
Contributor

@prapti prapti left a comment

Choose a reason for hiding this comment

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

LGTM! I've tested locally that there's no regression, will verify again on cloud server post merge.

@prapti prapti added 4: Reviews Complete All reviewers have approved the pull request and removed 3: QA Review Requires review by a QA tester labels Sep 28, 2020
@prapti
Copy link
Contributor

prapti commented Sep 28, 2020

@amyblais Done!

@lieut-data lieut-data merged commit be00c05 into cloud-beta Sep 28, 2020
@lieut-data lieut-data deleted the cherry-pick-mm-28716 branch September 28, 2020 16:17
@amyblais amyblais added Changelog/Done Required changelog entry has been written Docs/Not Needed Does not require documentation labels Sep 28, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@prapti prapti prapti approved these changes

@marianunez marianunez marianunez approved these changes

@cpoile cpoile cpoile approved these changes

Assignees

@lieut-data lieut-data

Labels
4: Reviews Complete All reviewers have approved the pull request Changelog/Done Required changelog entry has been written Docs/Not Needed Does not require documentation
Projects
None yet
Milestone
No milestone
7 participants
@lieut-data @marianunez @amyblais @mm-cloud-bot @prapti @cpoile @mattermost-build