summaryrefslogtreecommitdiff
path: root/app/controllers/admin/projects_controller.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-06-27 16:20:57 +0200
committerRémy Coutable <remy@rymai.me>2016-07-01 17:44:46 +0200
commitbd78f5733ca546bf940438b84aefa2fa3abacb36 (patch)
tree9d9ac648a594623489e628e025bde48f7ef2b2f9 /app/controllers/admin/projects_controller.rb
parent557ca2b31ff503b36a4b65af2641fcd0f5682d5b (diff)
downloadgitlab-ce-explicit-requesters-scope.tar.gz
Exclude requesters from Project#members, Group#members and User#membersexplicit-requesters-scope
And create new Project#requesters, Group#requesters scopes. Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/controllers/admin/projects_controller.rb')
-rw-r--r--app/controllers/admin/projects_controller.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb
index 87986fdf8b1..4c9c6362ffc 100644
--- a/app/controllers/admin/projects_controller.rb
+++ b/app/controllers/admin/projects_controller.rb
@@ -20,7 +20,8 @@ class Admin::ProjectsController < Admin::ApplicationController
@group_members = @group.members.order("access_level DESC").page(params[:group_members_page])
end
- @project_members = @project.project_members.page(params[:project_members_page])
+ @project_members = @project.members.page(params[:project_members_page])
+ @requesters = @project.requesters
end
def transfer