summaryrefslogtreecommitdiff
path: root/lib/api/triggers.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-02-09 12:13:58 -0500
committerRobert Speicher <rspeicher@gmail.com>2016-02-09 12:13:58 -0500
commit7ea60fbfc872e5acc0cc444d442958990747c6b3 (patch)
treebd4a38293d5d03b5cf3842fab04562fe8b775739 /lib/api/triggers.rb
parenta52c5778bb9d95097cc965539731a2ef846c3ff0 (diff)
parent201fb4c7e3f9ab4265f87f548ae22bb4008015c9 (diff)
downloadgitlab-ce-7ea60fbfc872e5acc0cc444d442958990747c6b3.tar.gz
Merge remote-tracking branch 'dev/master' into 'master'
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