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

[MM-22369] Filter out ldap group sync teams when adding a team to a user #7324

Merged
merged 11 commits into from
Jan 29, 2021
Merged

[MM-22369] Filter out ldap group sync teams when adding a team to a user #7324

merged 11 commits into from
Jan 29, 2021

Conversation

BenCookie95
Copy link
Contributor

Summary

When adding a team to a non ldap user we want to hide the groupsync teams from the team list

Ticket Link

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

@mattermod
Copy link
Contributor

Hello @BenCookie95,

Thanks for your pull request! A Core Committer will review your pull request soon. For code contributions, you can learn more about the review process here.

@hanzei hanzei added the 2: Dev Review Requires review by a core commiter label Jan 17, 2021
@hahmadia
Copy link
Contributor

/update-branch

@hahmadia hahmadia added the 3: QA Review Requires review by a QA tester label Jan 19, 2021
hahmadia
hahmadia reviewed Jan 19, 2021
View reviewed changes
Copy link
Contributor

@hahmadia hahmadia left a comment

Choose a reason for hiding this comment

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

A small non-blocking change otherwise looks good!

components/team_selector_modal/team_selector_modal.tsx Outdated Show resolved Hide resolved
Benjamin Cooke added 3 commits January 20, 2021 10:03
syntax changes
09ea87b
Merge branch 'MM-22369_filter-out-group-sync-channels' of github.com:…
fa9aa51 
…BenCookie95/mattermost-webapp into MM-22369_filter-out-group-sync-channels
remove comment
e2ee991
@hahmadia hahmadia self-requested a review January 20, 2021 18:33
hahmadia
hahmadia approved these changes Jan 20, 2021
View reviewed changes
Copy link
Contributor

@hahmadia hahmadia 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! Small non-blocking nit change. Thanks!

components/team_selector_modal/team_selector_modal.tsx Outdated Show resolved Hide resolved
@hahmadia hahmadia removed the 2: Dev Review Requires review by a core commiter label Jan 20, 2021
furqanmlk
furqanmlk approved these changes Jan 20, 2021
View reviewed changes
Copy link
Contributor

@furqanmlk furqanmlk 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,
Cypress tests passed
Added new test case MM-T3791

@furqanmlk
Copy link
Contributor

I will re-test if any changes are made after last dev review

@BenCookie95
Copy link
Contributor Author

/update-branch

@hahmadia hahmadia added 4: Reviews Complete All reviewers have approved the pull request AutoMerge used by Mattermod to merge PR automatically and removed 3: QA Review Requires review by a QA tester labels Jan 29, 2021
@mattermod
Copy link
Contributor

Will try to auto merge this PR once all tests and checks are passing. This might take up to an hour.

@mattermod
Copy link
Contributor

Trying to auto merge this PR.

@mattermod mattermod merged commit 86e4d4f into mattermost:master Jan 29, 2021
@mattermod
Copy link
Contributor

Pull Request successfully merged
SHA: 86e4d4f

@mattermod mattermod removed the AutoMerge used by Mattermod to merge PR automatically label Jan 29, 2021
@amyblais amyblais added this to the v5.33 milestone Jan 29, 2021
chetanyakan added a commit to brightscout-alpha/mattermost-webapp that referenced this pull request Feb 2, 2021
@chetanyakan
Merge branch 'master' of github.com:mattermost/mattermost-webapp into…
613f955 
… MM-2020

* 'master' of github.com:mattermost/mattermost-webapp: (175 commits)
  fix/update failed E2E tests (mattermost#7430)
  [MM-31791] Support Packet Generation FRONTEND (mattermost#7314)
  [MM-32269] System Console: TeamIcon edge cases (mattermost#7395)
  update steps for google openid (mattermost#7327)
  git checkout -b fix-slash-commands-tm4j (mattermost#7397)
  MM-31646: Update Office instructions (mattermost#7326)
  Cypress/E2E: Fix tests for archived channels (mattermost#7424)
  Cypress/E2E: Fix tests for bots in list and in sidebar (mattermost#7421)
  [MM-29108] Simplifies emoji reaction animation (mattermost#7386)
  Cypress/E2E: Overwrite cy.visit and cy.reload to have default 3s wait (mattermost#7410)
  [MM-22369] Filter out ldap group sync teams when adding a team to a user (mattermost#7324)
  MM 31192  - license renewal telemetry (mattermost#7413)
  Migrate message_attachments folder to Typescript (mattermost#7339)
  Cypress/E2E: Fix and reorganize tests for custom emojis (mattermost#7415)
  promote tests with 23 tm4j test cases (mattermost#7402)
  fix failed tests due to recent change in add users modal (mattermost#7398)
  fix for more channels and auth specs (mattermost#7416)
  fix e2e for sidebar channels (mattermost#7412)
  remove duplicate MM-T3294, fix MM-T1253 and fix/reorganize other keyboard shortcuts tests (mattermost#7390)
  MM-31735 - ReDisplay OpenID Connect (mattermost#7325)
  ...
chetanyakan added a commit to brightscout-alpha/mattermost-webapp that referenced this pull request Feb 2, 2021
@chetanyakan
Merge branch 'custom-status-1' into custom-status
881f58e 
* custom-status-1: (153 commits)
  Revert "Custom status base (#19)"
  Custom status base (#19)
  fix/update failed E2E tests (mattermost#7430)
  [MM-31791] Support Packet Generation FRONTEND (mattermost#7314)
  [MM-32269] System Console: TeamIcon edge cases (mattermost#7395)
  update steps for google openid (mattermost#7327)
  git checkout -b fix-slash-commands-tm4j (mattermost#7397)
  MM-31646: Update Office instructions (mattermost#7326)
  Cypress/E2E: Fix tests for archived channels (mattermost#7424)
  Cypress/E2E: Fix tests for bots in list and in sidebar (mattermost#7421)
  [MM-29108] Simplifies emoji reaction animation (mattermost#7386)
  Cypress/E2E: Overwrite cy.visit and cy.reload to have default 3s wait (mattermost#7410)
  [MM-22369] Filter out ldap group sync teams when adding a team to a user (mattermost#7324)
  MM 31192  - license renewal telemetry (mattermost#7413)
  Migrate message_attachments folder to Typescript (mattermost#7339)
  Cypress/E2E: Fix and reorganize tests for custom emojis (mattermost#7415)
  promote tests with 23 tm4j test cases (mattermost#7402)
  fix failed tests due to recent change in add users modal (mattermost#7398)
  fix for more channels and auth specs (mattermost#7416)
  fix e2e for sidebar channels (mattermost#7412)
  ...
@amyblais amyblais added Changelog/Done Required changelog entry has been written Docs/Not Needed Does not require documentation labels Feb 24, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@mkraft mkraft mkraft approved these changes

@furqanmlk furqanmlk furqanmlk approved these changes

@sbishel sbishel sbishel approved these changes

@hahmadia hahmadia hahmadia approved these changes

Assignees
No one assigned
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
v5.33.0
Development

Successfully merging this pull request may close these issues.
8 participants
@BenCookie95 @mattermod @hahmadia @furqanmlk @mkraft @sbishel @hanzei @amyblais