gitlab-org--gitlab-foss/spec
Douwe Maan 4dcf107b26 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 |
| --------- | ---- |
| ![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
2016-06-22 01:17:08 +00:00
..
config Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
controllers Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-executed' into 'master' 2016-06-22 01:15:29 +00:00
factories Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-project 2016-06-20 14:04:14 +00:00
features Merge branch '18871-check-improve-how-we-display-access-requesters-in-admin-area' into 'master' 2016-06-22 01:17:08 +00:00
finders Revert "squashed merge and fixed conflicts" 2016-06-16 12:59:07 +02:00
fixtures Show proper image ID on registry page 2016-06-21 13:08:10 +02:00
helpers Correctly adds commit ID into dropdown 2016-06-18 21:49:20 +01:00
initializers Add tests for setting trusted_proxies 2016-05-04 15:49:39 -07:00
javascripts Added text_utility to JS tests 2016-06-20 08:54:57 +01:00
lib Merge branch '18590-banzai-filter-relativelinkfilter-is-slow' into 'master' 2016-06-21 15:28:59 +00:00
mailers Fallback to group's owners/masters when a project has none 2016-06-20 12:10:37 +02:00
models Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-executed' into 'master' 2016-06-22 01:15:29 +00:00
requests Fix builds API response not including commit data 2016-06-21 14:26:57 +02:00
routing Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
services Raise a new Gitlab::Access::AccessDeniedError when permission is not enough to destroy a member 2016-06-18 06:06:34 +02:00
support Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export 2016-06-16 13:04:00 +02:00
tasks/gitlab Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
views
workers Unify check branch name exist 2016-06-20 21:44:21 +02:00
factories_spec.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00
rails_helper.rb
spec_helper.rb Enable Knapsack only in CI environment 2016-06-08 11:43:13 +02:00
teaspoon_env.rb Revert "Fix merge conflicts - squashed commit" 2016-06-03 11:10:17 +02:00