Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pins the roles submenu to the user permission row #3925

Merged
merged 2 commits into from Oct 5, 2022

Conversation

mgdelacroix
Copy link
Member

Summary

Adds an option to the openUp util to force the alignment to the bottom and uses it to pin the roles submenu to the user permission row.

Ticket Link

Fixes #3885

@mgdelacroix mgdelacroix added 2: Dev Review Requires review by a core committer CherryPick/Approved Meant for the quality or patch release tracked in the milestone labels Oct 4, 2022
@mgdelacroix mgdelacroix added this to the v7.3 milestone Oct 4, 2022
Copy link
Member

@harshilsharma63 harshilsharma63 left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@harshilsharma63 harshilsharma63 merged commit a69b0a4 into main Oct 5, 2022
@harshilsharma63 harshilsharma63 deleted the members-scroll-issue branch October 5, 2022 04:52
@mattermod
Copy link
Contributor

Cherry pick is scheduled.

@mattermod
Copy link
Contributor

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

+++ Updating remotes...
Fetching upstream
Failed to add the RSA host key for IP address '140.82.112.4' to the list of known hosts (/app/.ssh/known_hosts).
From github.com:mattermost/focalboard
   5bf40393..a69b0a44  main        -> upstream/main
   3debe231..51ff7b48  release-7.3 -> upstream/release-7.3
Fetching origin
Failed to add the RSA host key for IP address '140.82.112.4' to the list of known hosts (/app/.ssh/known_hosts).
+++ Updating remotes done...
+++ Creating local branch automated-cherry-pick-of-focalboard-#3925-upstream-release-7.3-1664945547
Switched to a new branch 'automated-cherry-pick-of-focalboard-#3925-upstream-release-7.3-1664945547'
Branch 'automated-cherry-pick-of-focalboard-#3925-upstream-release-7.3-1664945547' set up to track remote branch 'release-7.3' from 'upstream'.

+++ About to attempt cherry pick of PR #3925 with merge commit a69b0a44dc0692d402b248efd754c6ecee479121.

error: could not apply a69b0a44... Pins the roles submenu to the user permission row (#3925)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

+++ Conflicts detected:

UU webapp/src/widgets/menu/menuUtil.ts
Aborting.

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

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

mgdelacroix added a commit that referenced this pull request Oct 5, 2022
* Pins the roles submenu to the user permission row

* Fix snapshots
mgdelacroix added a commit that referenced this pull request Oct 5, 2022
* Pins the roles submenu to the user permission row

* Fix snapshots
@mgdelacroix mgdelacroix 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 Oct 5, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2: Dev Review Requires review by a core committer CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Bug: Role drop-down for Share boards gets pushed down on boards with many members
3 participants