diff options
| author | Phil Hughes <me@iamphill.com> | 2017-06-30 12:31:41 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-06-30 12:37:35 +0100 |
| commit | 531a4d124b0a17280b4118d7fa7c66f11042917b (patch) | |
| tree | a2ee668d403ed538d6046f942f31bce2c1224563 /lib/api/projects.rb | |
| parent | f5681fb55a762c9b9bb35c80bf87d727d8d8fd06 (diff) | |
| parent | 81dba76b9d7d120cd22e3619a4058bd4885be9bc (diff) | |
| download | gitlab-ce-experimental-breadcrumbs.tar.gz | |
Merge branch 'master' into experimental-breadcrumbsexperimental-breadcrumbs
Diffstat (limited to 'lib/api/projects.rb')
| -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..d0bd64b2972 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -1,3 +1,5 @@ +require_dependency '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 |