summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhttp://jneen.net/ <jneen@jneen.net>2017-04-11 14:07:46 -0700
committerhttp://jneen.net/ <jneen@jneen.net>2017-06-27 12:44:38 -0700
commit59e7c39f4ceb054d3803e3012107a3d0d6d2d2f4 (patch)
treeb4ac2fc9a8ba739bf9e5e79994824aec67c5e2a7
parente895b49fce13342cd33f22735069484844dd5d77 (diff)
downloadgitlab-ce-59e7c39f4ceb054d3803e3012107a3d0d6d2d2f4.tar.gz
use subject scope in :id/users
since we're loading all the members anyways
-rw-r--r--lib/api/projects.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index c5df45b7902..886e97a2638 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -1,3 +1,5 @@
+require 'declarative_policy'
+
module API
# Projects API
class Projects < Grape::API
@@ -396,7 +398,7 @@ module API
use :pagination
end
get ':id/users' do
- users = user_project.team.users
+ users = DeclarativePolicy.subject_scope { user_project.team.users }
users = users.search(params[:search]) if params[:search].present?
present paginate(users), with: Entities::UserBasic