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

[MM-29684] Add check for isCloud to main_menu for displaying user_limit_modal #6792

Merged
merged 2 commits into from
Oct 19, 2020
Merged

[MM-29684] Add check for isCloud to main_menu for displaying user_limit_modal #6792

merged 2 commits into from
Oct 19, 2020

Conversation

nickmisasi
Copy link
Contributor

Summary

This check was missing on the user limit modal, which meant that on any license you would see the modal if the userlimit was non-zero.

Ticket Link

https://mattermost.atlassian.net/browse/MM-29684

Related Pull Requests

N/a

Screenshots

n/a

@nickmisasi nickmisasi added 2: Dev Review Requires review by a core commiter 3: QA Review Requires review by a QA tester labels Oct 14, 2020
@nickmisasi
Copy link
Contributor Author

/check-cla

@nickmisasi
Copy link
Contributor Author

/update-branch

@nickmisasi nickmisasi added 4: Reviews Complete All reviewers have approved the pull request and removed 2: Dev Review Requires review by a core commiter 3: QA Review Requires review by a QA tester labels Oct 19, 2020
@nickmisasi nickmisasi self-assigned this Oct 19, 2020
@nickmisasi nickmisasi merged commit 65b0319 into master Oct 19, 2020
@nickmisasi nickmisasi deleted the MM-29684 branch October 19, 2020 17:21
@nickmisasi
Copy link
Contributor Author

/cherry-pick cloud-ga

@mattermod
Copy link
Contributor

Cherry pick is scheduled.

mattermost-build pushed a commit to mattermost-build/mattermost-webapp that referenced this pull request Oct 19, 2020
@nickmisasi @mattermost-build
Add check for isCloud to main_menu for displaying user_limit_modal (m…
d2a86b1 
…attermost#6792)

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
(cherry picked from commit 65b0319)
@mattermost-build mattermost-build mentioned this pull request Oct 19, 2020
Merged
@mattermod mattermod added the CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone label Oct 19, 2020
nickmisasi added a commit that referenced this pull request Oct 19, 2020
@mattermost-build @nickmisasi
Add check for isCloud to main_menu for displaying user_limit_modal (#…
4637d57 
…6792) (#6837)

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
(cherry picked from commit 65b0319)

Co-authored-by: Nick Misasi <nick.misasi@mattermost.com>
@amyblais amyblais added Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation labels Oct 19, 2020
jfrerich pushed a commit that referenced this pull request Oct 23, 2020
@nickmisasi @mattermod @jfrerich
Add check for isCloud to main_menu for displaying user_limit_modal (#…
ed1a21c 
…6792)

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
calebroseland pushed a commit that referenced this pull request Oct 27, 2020
@nickmisasi @mattermod @calebroseland
Add check for isCloud to main_menu for displaying user_limit_modal (#…
c4785de 
…6792)

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@marianunez marianunez marianunez approved these changes

@alifarooq0 alifarooq0 alifarooq0 approved these changes

Assignees

@nickmisasi nickmisasi

Labels
4: Reviews Complete All reviewers have approved the pull request Changelog/Not Needed Does not require a changelog entry CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone Docs/Not Needed Does not require documentation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@nickmisasi @mattermod @marianunez @alifarooq0 @amyblais