summaryrefslogtreecommitdiff
path: root/lib/api/triggers.rb
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-02-08 23:33:44 +0000
committerRobert Speicher <robert@gitlab.com>2016-02-08 23:33:44 +0000
commit201fb4c7e3f9ab4265f87f548ae22bb4008015c9 (patch)
tree9f203162f734ac6e214c9725b2479e5f3fccc021 /lib/api/triggers.rb
parent2ad872382b49d4802a9ea5e2c7e8773949d83b2a (diff)
parent311f407651e9ad1859bb0e9b6b9d6de79fde1a3d (diff)
downloadgitlab-ce-201fb4c7e3f9ab4265f87f548ae22bb4008015c9.tar.gz
Merge branch 'ci-permissions' into 'master'
Limit guest access to builds Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2646 See merge request !1942
Diffstat (limited to 'lib/api/triggers.rb')
-rw-r--r--lib/api/triggers.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/api/triggers.rb b/lib/api/triggers.rb
index 5e4964f446c..d1d07394e92 100644
--- a/lib/api/triggers.rb
+++ b/lib/api/triggers.rb
@@ -54,7 +54,7 @@ module API
# GET /projects/:id/triggers
get ':id/triggers' do
authenticate!
- authorize_admin_project
+ authorize! :admin_build, user_project
triggers = user_project.triggers.includes(:trigger_requests)
triggers = paginate(triggers)
@@ -71,7 +71,7 @@ module API
# GET /projects/:id/triggers/:token
get ':id/triggers/:token' do
authenticate!
- authorize_admin_project
+ authorize! :admin_build, user_project
trigger = user_project.triggers.find_by(token: params[:token].to_s)
return not_found!('Trigger') unless trigger
@@ -87,7 +87,7 @@ module API
# POST /projects/:id/triggers
post ':id/triggers' do
authenticate!
- authorize_admin_project
+ authorize! :admin_build, user_project
trigger = user_project.triggers.create
@@ -103,7 +103,7 @@ module API
# DELETE /projects/:id/triggers/:token
delete ':id/triggers/:token' do
authenticate!
- authorize_admin_project
+ authorize! :admin_build, user_project
trigger = user_project.triggers.find_by(token: params[:token].to_s)
return not_found!('Trigger') unless trigger