diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-29 13:20:24 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-29 13:20:24 +0000 |
| commit | 8c5538be40b527ad8b5e3468730b84416ec536c1 (patch) | |
| tree | 4ddb0b5ac9b2215bbd137b1d1851ba38d582fe9b /lib/api | |
| parent | adf792f1f7288e8c10bf01efa0b78e30243889fe (diff) | |
| parent | 72dc16dabd8996329b4272a03af47ef296a737f8 (diff) | |
| download | gitlab-ce-8c5538be40b527ad8b5e3468730b84416ec536c1.tar.gz | |
Merge branch 'refactor/declarative-policy' into 'master'
Refactor/declarative policy
See merge request !10515
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/projects.rb | 4 |
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 |