diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-30 12:09:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-30 12:09:35 +0300 |
| commit | bf774d67fc8a84f76f20494c318d7cfacb0c69ac (patch) | |
| tree | b991cad6b68560d19f8ce3075577aab2eb51fae6 /app/assets/javascripts/members | |
| parent | 50f0475ee134da9ea12e758a9f3250f2ab19cd65 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/members')
| -rw-r--r-- | app/assets/javascripts/members/components/members_tabs.vue | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/members/constants.js | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/app/assets/javascripts/members/components/members_tabs.vue b/app/assets/javascripts/members/components/members_tabs.vue index ee4743010cf..98995730df4 100644 --- a/app/assets/javascripts/members/components/members_tabs.vue +++ b/app/assets/javascripts/members/components/members_tabs.vue @@ -77,6 +77,10 @@ export default { urlParams.push(state.filteredSearchBar.searchParam); } + if (state?.filteredSearchBar?.tokens) { + urlParams.push(...state.filteredSearchBar.tokens); + } + return urlParams; }, getTabCount({ namespace }) { diff --git a/app/assets/javascripts/members/constants.js b/app/assets/javascripts/members/constants.js index c66a19c4765..943742e184b 100644 --- a/app/assets/javascripts/members/constants.js +++ b/app/assets/javascripts/members/constants.js @@ -130,9 +130,15 @@ export const FILTERED_SEARCH_TOKEN_WITH_INHERITED_PERMISSIONS = { ], }; +export const FILTERED_SEARCH_TOKEN_GROUPS_WITH_INHERITED_PERMISSIONS = { + ...FILTERED_SEARCH_TOKEN_WITH_INHERITED_PERMISSIONS, + type: 'groups_with_inherited_permissions', +}; + export const AVAILABLE_FILTERED_SEARCH_TOKENS = [ FILTERED_SEARCH_TOKEN_TWO_FACTOR, FILTERED_SEARCH_TOKEN_WITH_INHERITED_PERMISSIONS, + FILTERED_SEARCH_TOKEN_GROUPS_WITH_INHERITED_PERMISSIONS, ]; export const AVATAR_SIZE = 48; |