diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-27 17:20:57 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-01 18:44:46 +0300 |
| commit | bd78f5733ca546bf940438b84aefa2fa3abacb36 (patch) | |
| tree | 9d9ac648a594623489e628e025bde48f7ef2b2f9 /app/views/admin/groups/show.html.haml | |
| parent | 557ca2b31ff503b36a4b65af2641fcd0f5682d5b (diff) | |
Exclude requesters from Project#members, Group#members and User#members
And create new Project#requesters, Group#requesters scopes.
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/views/admin/groups/show.html.haml')
| -rw-r--r-- | app/views/admin/groups/show.html.haml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml index 50770465f07..522153b37e3 100644 --- a/app/views/admin/groups/show.html.haml +++ b/app/views/admin/groups/show.html.haml @@ -89,16 +89,16 @@ %hr = button_tag 'Add users to group', class: "btn btn-create" - = render 'shared/members/requests', membership_source: @group, members: @members.request + = render 'shared/members/requests', membership_source: @group, requesters: @requesters .panel.panel-default .panel-heading %strong= @group.name group members - %span.badge= @group.members.non_request.size + %span.badge= @group.members.size .pull-right = link_to icon('pencil-square-o', text: 'Manage Access'), polymorphic_url([@group, :members]), class: "btn btn-xs" %ul.well-list.group-users-list.content-list - = render partial: 'shared/members/member', collection: @members.non_request, as: :member, locals: { show_controls: false } + = render partial: 'shared/members/member', collection: @members, as: :member, locals: { show_controls: false } .panel-footer - = paginate @members.non_request, param_name: 'members_page', theme: 'gitlab' + = paginate @members, param_name: 'members_page', theme: 'gitlab' |