diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-02-10 18:03:57 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-02-10 18:03:57 +0000 |
| commit | 6588f8ec8d2deca2440962cadd698d348e621da7 (patch) | |
| tree | 123fe3c43f25ab9fd096fa3ab456ae64a6806c2d /app/controllers | |
| parent | 7adfc0c0bc9d0477f767baa5280c57a785d8130d (diff) | |
| parent | 5f85487c1526f2921f1cef30aceb2fddf84d3632 (diff) | |
| download | gitlab-ce-6588f8ec8d2deca2440962cadd698d348e621da7.tar.gz | |
Merge branch 'dz-nested-groups-members-page' into 'master'
Nested groups members page
See merge request !9062
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/groups/group_members_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/groups/group_members_controller.rb b/app/controllers/groups/group_members_controller.rb index 4f273a8d4f0..0cbf3eb58a3 100644 --- a/app/controllers/groups/group_members_controller.rb +++ b/app/controllers/groups/group_members_controller.rb @@ -9,7 +9,7 @@ class Groups::GroupMembersController < Groups::ApplicationController @sort = params[:sort].presence || sort_value_name @project = @group.projects.find(params[:project_id]) if params[:project_id] - @members = @group.group_members + @members = GroupMembersFinder.new(@group).execute @members = @members.non_invite unless can?(current_user, :admin_group, @group) @members = @members.search(params[:search]) if params[:search].present? @members = @members.sort(@sort) |