summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2017-08-29 12:15:43 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2017-08-29 12:15:43 +0000
commit01785533a5ba26e9dbed7972d9732a9b122ff3e0 (patch)
tree0b50f09dd6c5d04f68a620e80869eaba4c4cc5a9 /app
parent418f01a6c4ccfafcad043122465357e38b7b462e (diff)
parent4401b7595510a6126a1d38b5743113777ad9aa2f (diff)
downloadgitlab-ce-01785533a5ba26e9dbed7972d9732a9b122ff3e0.tar.gz
Merge branch 'fix/sm/37040-regression-pipeline-trigger-via-api-fails-with-500-internal-server-error-in-9-5-1' into 'master'
Fix pipeline trigger via API fails with 500 Internal Server Error in 9.5.1 Closes #37040 See merge request !13861
Diffstat (limited to 'app')
-rw-r--r--app/services/ci/create_pipeline_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb
index d0ba9f89460..de2cd7e87be 100644
--- a/app/services/ci/create_pipeline_service.rb
+++ b/app/services/ci/create_pipeline_service.rb
@@ -15,7 +15,7 @@ module Ci
pipeline_schedule: schedule
)
- result = validate(current_user || trigger_request.trigger.owner,
+ result = validate(current_user,
ignore_skip_ci: ignore_skip_ci,
save_on_errors: save_on_errors)