summaryrefslogtreecommitdiff
path: root/lib/api/triggers.rb
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2017-07-25 15:04:23 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2017-07-25 15:04:23 +0000
commitac948684fc9f4ded80a028ad2136cfbff90a4b45 (patch)
treefe4d625514c702b1b66c5575deefd1ce4d5bc0ba /lib/api/triggers.rb
parent3f59e354a7324e9bf332a34661743d85e82b987c (diff)
parent8a444484345806dcbc0312d770b185edde1edb67 (diff)
downloadgitlab-ce-ac948684fc9f4ded80a028ad2136cfbff90a4b45.tar.gz
Merge branch '30634-protected-pipeline' into 'master'
Implement "Block pipelines on protected branches" Closes #30634, #34616, and #33130 See merge request !11910
Diffstat (limited to 'lib/api/triggers.rb')
-rw-r--r--lib/api/triggers.rb11
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/api/triggers.rb b/lib/api/triggers.rb
index cb0619105e1..9375e7eb768 100644
--- a/lib/api/triggers.rb
+++ b/lib/api/triggers.rb
@@ -27,12 +27,13 @@ module API
end
# create request and trigger builds
- trigger_request = Ci::CreateTriggerRequestService.new.execute(project, trigger, params[:ref].to_s, variables)
- if trigger_request
- present trigger_request.pipeline, with: Entities::Pipeline
+ result = Ci::CreateTriggerRequestService.execute(project, trigger, params[:ref].to_s, variables)
+ pipeline = result.pipeline
+
+ if pipeline.persisted?
+ present pipeline, with: Entities::Pipeline
else
- errors = 'No pipeline created'
- render_api_error!(errors, 400)
+ render_validation_error!(pipeline)
end
end