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

MM-27635: Hide internal bots from UX #6169

Merged
merged 3 commits into from
Aug 19, 2020
Merged

MM-27635: Hide internal bots from UX #6169

merged 3 commits into from
Aug 19, 2020

Conversation

catalintomai
Copy link
Contributor

Summary

Hide internal bots

Ticket Link

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

Related Pull Requests

mattermost/mattermost-redux#1216

@catalintomai catalintomai mentioned this pull request Aug 17, 2020
Merged
@catalintomai catalintomai added this to the v5.27 milestone Aug 17, 2020
@catalintomai catalintomai added 2: Dev Review Requires review by a core commiter 3: QA Review Requires review by a QA tester labels Aug 17, 2020
@amyblais amyblais added the CherryPick/Approved Meant for the quality or patch release tracked in the milestone label Aug 17, 2020
srkgupta
srkgupta approved these changes Aug 18, 2020
View reviewed changes
Copy link
Contributor

@srkgupta srkgupta left a comment

Choose a reason for hiding this comment

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

Tested the PR along with its dependent PR and now the Advisor Bot Account is not displayed in the Integrations > Bot Accounts page. Approving the PR.

@srkgupta srkgupta removed the 3: QA Review Requires review by a QA tester label Aug 18, 2020
@amyblais
Copy link
Member

@catalintomai Farhan is off this week. Perhaps another dev could review this,

@catalintomai catalintomai requested review from hahmadia and removed request for fmunshi August 18, 2020 15:41
@hahmadia hahmadia added 4: Reviews Complete All reviewers have approved the pull request and removed 2: Dev Review Requires review by a core commiter labels Aug 18, 2020
@catalintomai catalintomai merged commit 296e456 into mattermost:master Aug 19, 2020
@mattermod
Copy link
Contributor

@catalintomai
Error trying doing the automated Cherry picking. Please do this manually

+++ Updating remotes...
Fetching upstream
Fetching origin
+++ Updating remotes done...
+++ Creating local branch automated-cherry-pick-of-mattermost-webapp-#6169-upstream-release-5.27-1597815131
Branch 'automated-cherry-pick-of-mattermost-webapp-#6169-upstream-release-5.27-1597815131' set up to track remote branch 'release-5.27' from 'upstream'.

+++ About to attempt cherry pick of PR #6169 with merge commit 296e45697cc1941660a680d91abcfe5f26139861.


+++ Conflicts detected:

UU package-lock.json
UU package.json

+++ Aborting in-progress git cherry-pick.

+++ Returning you to the master branch and cleaning up.

@amyblais
Copy link
Member

@catalintomai Has this been cherry picked?

@catalintomai
Copy link
Contributor Author

catalintomai commented Aug 20, 2020 •
edited
Loading

@catalintomai Has this been cherry picked?

@amyblais yes.

@amyblais amyblais added CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone Changelog/Done Required changelog entry has been written Docs/Not Needed Does not require documentation and removed CherryPick/Approved Meant for the quality or patch release tracked in the milestone labels Aug 20, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@mkraft mkraft mkraft approved these changes

@srkgupta srkgupta srkgupta approved these changes

@hahmadia hahmadia hahmadia approved these changes

Assignees

@catalintomai catalintomai

Labels
4: Reviews Complete All reviewers have approved the pull request Changelog/Done Required changelog entry has been written 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
v5.27.0
Development

Successfully merging this pull request may close these issues.
6 participants
@catalintomai @amyblais @mattermod @mkraft @srkgupta @hahmadia