summaryrefslogtreecommitdiff
path: root/lib/api/services.rb
diff options
context:
space:
mode:
authorZ.J. van de Weg <git@zjvandeweg.nl>2016-11-18 11:38:54 +0100
committerZ.J. van de Weg <git@zjvandeweg.nl>2016-11-18 11:38:54 +0100
commitf749fb7fe0574d07eeb38561b9af62754e518281 (patch)
treee8647693e60b73f12cd3b9dca0efb0aec1796fcb /lib/api/services.rb
parentb8607576c1bb25fe2cbb575b48becdf7bd4aaa8c (diff)
downloadgitlab-ce-f749fb7fe0574d07eeb38561b9af62754e518281.tar.gz
Improve style, add more tests
Diffstat (limited to 'lib/api/services.rb')
-rw-r--r--lib/api/services.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/api/services.rb b/lib/api/services.rb
index 163187d450d..e3c6a998631 100644
--- a/lib/api/services.rb
+++ b/lib/api/services.rb
@@ -67,7 +67,9 @@ module API
post ':id/services/:service_slug/trigger' do
project = Project.find_with_namespace(params[:id]) || Project.find_by(id: params[:id])
- service = service_by_slug(project, params[:service_slug])
+ not_found! unless project
+
+ service = project_service(project)
result = service.try(:active?) && service.try(:trigger, params)
@@ -75,7 +77,7 @@ module API
status result[:status] || 200
present result
else
- not_found!('Service')
+ not_found!
end
end
end