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

Fix invitation modal back buton (bad merge resolution) #4276

Merged
merged 1 commit into from
Nov 20, 2019
Merged

Fix invitation modal back buton (bad merge resolution) #4276

merged 1 commit into from
Nov 20, 2019

Conversation

jespino
Copy link
Member

@jespino jespino commented Nov 20, 2019

Summary

Fix invitation modal back buton (bad merge resolution)

Ticket Link

MM-20283

@jespino jespino added this to the v5.18.0 milestone Nov 20, 2019
@jespino jespino added 2: Dev Review Requires review by a core commiter 3: QA Review Requires review by a QA tester CherryPick/Approved Meant for the quality or patch release tracked in the milestone labels Nov 20, 2019
@jespino jespino requested a review from a team November 20, 2019 11:30
@ghost ghost requested review from catalintomai and ethervoid and removed request for a team November 20, 2019 11:30
@lindalumitchell lindalumitchell added the Setup Cloud Test Server Setup a test server using Mattermost Cloud label Nov 20, 2019
ethervoid
ethervoid approved these changes Nov 20, 2019
View reviewed changes
Copy link
Contributor

@ethervoid ethervoid left a comment

Choose a reason for hiding this comment

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

Looks good to me

@jespino jespino removed the 2: Dev Review Requires review by a core commiter label Nov 20, 2019
lindalumitchell
lindalumitchell approved these changes Nov 20, 2019
View reviewed changes
Copy link
Contributor

@lindalumitchell lindalumitchell left a comment

Choose a reason for hiding this comment

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

LGTM. Verified various invite flows including with and without Guest enabled, inviting as guest or member, invited by sysadmin or member, invite link, inviting by email or username already on the server. No issues seen.

@lindalumitchell lindalumitchell added QA Review Done and removed 3: QA Review Requires review by a QA tester labels Nov 20, 2019
@jespino jespino merged commit d56cde6 into mattermost:master Nov 20, 2019
@jespino jespino deleted the MM-20283 branch November 20, 2019 18:40
@mattermod
Copy link
Contributor

Test server destroyed

@mattermost-build mattermost-build mentioned this pull request Nov 20, 2019
Merged
@mattermod mattermod added CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone and removed CherryPick/Approved Meant for the quality or patch release tracked in the milestone labels Nov 20, 2019
@amyblais amyblais added Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation labels Nov 20, 2019
@stevemudie stevemudie added the Tests/Done Release tests have been written label Dec 3, 2019
@hanzei hanzei removed the Setup Cloud Test Server Setup a test server using Mattermost Cloud label Dec 10, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ethervoid ethervoid ethervoid approved these changes

@lindalumitchell lindalumitchell lindalumitchell approved these changes

@catalintomai catalintomai catalintomai approved these changes

Assignees
No one assigned
Labels
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 QA Review Done Tests/Done Release tests have been written
Projects
None yet
Milestone
v5.18.0
8 participants
@jespino @mattermod @ethervoid @lindalumitchell @catalintomai @stevemudie @hanzei @amyblais