BigW Consortium Gitlab
Display group/project access requesters separately in admin ## What does this MR do? It displays the access requesters in a separate list in group & project members pages. It also harmonize the members counter UI to use `%span.badge` everywhere (in the admin & non-admin members views). ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? To not confuse access requesters with actual members. ## What are the relevant issue numbers? Closes #18871. ## Screenshots ### Group members | Before | After | | --------- | ---- | | ![group-members-before](/uploads/2f15137e073fd3a63bc2cb7b2217cb6c/group-members-before.png) | ![group-members-after](/uploads/5b643974505cfa57783fa0320d3bf8b2/group-members-after.png) | ### Project members | Before | After | | --------- | ---- | | ![project-members-before](/uploads/9c48dcd3736e42de84061b1201ee0b06/project-members-before.png) | ![project-members-after](/uploads/8e04c92ef0bba3de7e2405618632b27d/project-members-after.png) | ### Admin group members | Before | After | | --------- | ---- | | ![admin-group-members-before](/uploads/7fda8c2c94b697bea6655ba892ba45e7/admin-group-members-before.png) | ![admin-group-members-after](/uploads/ea25717001794f75939c679b80308c3a/admin-group-members-after.png) | ### Admin project members | Before | After | | --------- | ---- | | ![admin-project-members-before](/uploads/ba9d3ec52adbda6bb3d45ad9ac5243d3/admin-project-members-before.png) | ![admin-project-members-after](/uploads/3b889a029a9756e9ed2781b45c4dd9cb/admin-project-members-after.png) | ## Does this MR meet the acceptance criteria? - [x] No CHANGELOG since this is related to the original "request access" MR. - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4798
Name |
Last commit
|
Last update |
---|---|---|
.. | ||
artifacts | Loading commit data... | |
badges | Loading commit data... | |
blame | Loading commit data... | |
blob | Loading commit data... | |
branches | Loading commit data... | |
builds | Loading commit data... | |
buttons | Loading commit data... | |
ci | Loading commit data... | |
commit | Loading commit data... | |
commits | Loading commit data... | |
compare | Loading commit data... | |
container_registry | Loading commit data... | |
deploy_keys | Loading commit data... | |
deployments | Loading commit data... | |
diffs | Loading commit data... | |
environments | Loading commit data... | |
find_file | Loading commit data... | |
forks | Loading commit data... | |
generic_commit_statuses | Loading commit data... | |
graphs | Loading commit data... | |
group_links | Loading commit data... | |
hooks | Loading commit data... | |
imports | Loading commit data... | |
issues | Loading commit data... | |
labels | Loading commit data... | |
merge_requests | Loading commit data... | |
milestones | Loading commit data... | |
network | Loading commit data... | |
notes | Loading commit data... | |
pipelines | Loading commit data... | |
project_members | Loading commit data... | |
protected_branches | Loading commit data... | |
refs | Loading commit data... | |
releases | Loading commit data... | |
repositories | Loading commit data... | |
runners | Loading commit data... | |
services | Loading commit data... | |
snippets | Loading commit data... | |
tags | Loading commit data... | |
tree | Loading commit data... | |
triggers | Loading commit data... | |
variables | Loading commit data... | |
wikis | Loading commit data... | |
_activity.html.haml | Loading commit data... | |
_bitbucket_import_modal.html.haml | Loading commit data... | |
_builds_settings.html.haml | Loading commit data... | |
_commit_button.html.haml | Loading commit data... | |
_errors.html.haml | Loading commit data... | |
_files.html.haml | Loading commit data... | |
_find_file_link.html.haml | Loading commit data... | |
_github_import_modal.html.haml | Loading commit data... | |
_gitlab_import_modal.html.haml | Loading commit data... | |
_home_panel.html.haml | Loading commit data... | |
_last_commit.html.haml | Loading commit data... | |
_last_push.html.haml | Loading commit data... | |
_md_preview.html.haml | Loading commit data... | |
_merge_request_settings.html.haml | Loading commit data... | |
_readme.html.haml | Loading commit data... | |
_zen.html.haml | Loading commit data... | |
activity.html.haml | Loading commit data... | |
edit.html.haml | Loading commit data... | |
empty.html.haml | Loading commit data... | |
new.html.haml | Loading commit data... | |
no_repo.html.haml | Loading commit data... | |
remove_fork.js.haml | Loading commit data... | |
show.atom.builder | Loading commit data... | |
show.html.haml | Loading commit data... | |
transfer.js.haml | Loading commit data... | |
update.js.haml | Loading commit data... |