Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-10 16:14:59 +0300
committerDouwe Maan <douwe@gitlab.com>2015-04-14 13:07:33 +0300
commit90dafe31c4b1bb54bcd0476a873c4f5cdb62e981 (patch)
treee10e6d5ade6a13c3311f222ca45856966ffc6df2 /app/controllers/groups/group_members_controller.rb
parent2a1d4255da396d37579e25dd88d5a9ea76116c22 (diff)
Only show invited users to people who can admin group.
Diffstat (limited to 'app/controllers/groups/group_members_controller.rb')
-rw-r--r--app/controllers/groups/group_members_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/groups/group_members_controller.rb b/app/controllers/groups/group_members_controller.rb
index 93fc4edb3bb..f8aa4b0bbd5 100644
--- a/app/controllers/groups/group_members_controller.rb
+++ b/app/controllers/groups/group_members_controller.rb
@@ -11,6 +11,7 @@ class Groups::GroupMembersController < Groups::ApplicationController
def index
@project = @group.projects.find(params[:project_id]) if params[:project_id]
@members = @group.group_members
+ @members = @members.non_invite unless can?(current_user, :admin_group, @group)
if params[:search].present?
users = @group.users.search(params[:search]).to_a