Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Maczukin <tomasz@maczukin.pl>2016-01-13 14:16:27 +0300
committerTomasz Maczukin <tomasz@maczukin.pl>2016-01-13 14:20:59 +0300
commitd44653da1f74c2c15fe7ec3f8aa9b16563ffebd6 (patch)
tree21c24d4e528adf4ff9e9526f85418ea5800b0138 /lib/api/triggers.rb
parente0ec69d919cb44194e76034f2324ec0d4f5f1df6 (diff)
Add some fixes after review
Diffstat (limited to 'lib/api/triggers.rb')
-rw-r--r--lib/api/triggers.rb11
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/api/triggers.rb b/lib/api/triggers.rb
index 25bb8aef20b..5e4964f446c 100644
--- a/lib/api/triggers.rb
+++ b/lib/api/triggers.rb
@@ -73,10 +73,10 @@ module API
authenticate!
authorize_admin_project
- triggers = user_project.triggers.where(token: params[:token])
- return not_found!('Trigger') if triggers.empty?
+ trigger = user_project.triggers.find_by(token: params[:token].to_s)
+ return not_found!('Trigger') unless trigger
- present triggers.first, with: Entities::Trigger
+ present trigger, with: Entities::Trigger
end
# Create trigger
@@ -89,8 +89,7 @@ module API
authenticate!
authorize_admin_project
- trigger = user_project.triggers.new
- trigger.save
+ trigger = user_project.triggers.create
present trigger, with: Entities::Trigger
end
@@ -106,7 +105,7 @@ module API
authenticate!
authorize_admin_project
- trigger = user_project.triggers.where(token: params[:token]).first
+ trigger = user_project.triggers.find_by(token: params[:token].to_s)
return not_found!('Trigger') unless trigger
trigger.destroy