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 |
---|---|---|
.. | ||
groups | Loading commit data... | |
icons | Loading commit data... | |
issuable | Loading commit data... | |
members | Loading commit data... | |
milestones | Loading commit data... | |
notifications | Loading commit data... | |
projects | Loading commit data... | |
snippets | Loading commit data... | |
web_hooks | Loading commit data... | |
_choose_group_avatar_button.html.haml | Loading commit data... | |
_clone_panel.html.haml | Loading commit data... | |
_commit_message_container.html.haml | Loading commit data... | |
_confirm_modal.html.haml | Loading commit data... | |
_event_filter.html.haml | Loading commit data... | |
_field.html.haml | Loading commit data... | |
_file_highlight.html.haml | Loading commit data... | |
_group_form.html.haml | Loading commit data... | |
_group_tips.html.haml | Loading commit data... | |
_import_form.html.haml | Loading commit data... | |
_issues.html.haml | Loading commit data... | |
_label_row.html.haml | Loading commit data... | |
_labels_row.html.haml | Loading commit data... | |
_logo.svg | Loading commit data... | |
_merge_requests.html.haml | Loading commit data... | |
_milestone_expired.html.haml | Loading commit data... | |
_milestones_filter.html.haml | Loading commit data... | |
_new_commit_form.html.haml | Loading commit data... | |
_new_project_item_select.html.haml | Loading commit data... | |
_no_password.html.haml | Loading commit data... | |
_no_ssh.html.haml | Loading commit data... | |
_outdated_browser.html.haml | Loading commit data... | |
_project_limit.html.haml | Loading commit data... | |
_promo.html.haml | Loading commit data... | |
_ref_switcher.html.haml | Loading commit data... | |
_service_settings.html.haml | Loading commit data... | |
_show_aside.html.haml | Loading commit data... | |
_sort_dropdown.html.haml | Loading commit data... | |
_visibility_level.html.haml | Loading commit data... | |
_visibility_radios.html.haml | Loading commit data... |