-
- Downloads
There was a problem fetching the pipeline summary.
Merge branch '18871-check-improve-how-we-display-access-requesters-in-admin-area' into 'master'
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 | | --------- | ---- | |  |  | ### Project members | Before | After | | --------- | ---- | |  |  | ### Admin group members | Before | After | | --------- | ---- | |  |  | ### Admin project members | Before | After | | --------- | ---- | |  |  | ## 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
No related branches found
No related tags found
Pipeline #
Showing
- app/views/admin/groups/show.html.haml 11 additions, 22 deletionsapp/views/admin/groups/show.html.haml
- app/views/admin/projects/show.html.haml 16 additions, 33 deletionsapp/views/admin/projects/show.html.haml
- app/views/groups/group_members/index.html.haml 1 addition, 2 deletionsapp/views/groups/group_members/index.html.haml
- app/views/projects/project_members/_group_members.html.haml 1 addition, 2 deletionsapp/views/projects/project_members/_group_members.html.haml
- app/views/projects/project_members/_shared_group_members.html.haml 3 additions, 2 deletions.../projects/project_members/_shared_group_members.html.haml
- app/views/projects/project_members/_team.html.haml 1 addition, 2 deletionsapp/views/projects/project_members/_team.html.haml
- app/views/projects/project_members/index.html.haml 1 addition, 1 deletionapp/views/projects/project_members/index.html.haml
- app/views/shared/members/_requests.html.haml 1 addition, 1 deletionapp/views/shared/members/_requests.html.haml
- features/admin/groups.feature 0 additions, 7 deletionsfeatures/admin/groups.feature
- features/steps/admin/groups.rb 1 addition, 7 deletionsfeatures/steps/admin/groups.rb
- spec/features/groups/members/owner_manages_access_requests_spec.rb 1 addition, 1 deletion...ures/groups/members/owner_manages_access_requests_spec.rb
- spec/features/projects/members/master_manages_access_requests_spec.rb 1 addition, 1 deletion...s/projects/members/master_manages_access_requests_spec.rb
Loading
Please register or sign in to comment