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:
authorJarka Kadlecova <jarka@gitlab.com>2017-09-15 09:04:21 +0300
committerJarka Kadlecova <jarka@gitlab.com>2017-09-15 09:04:21 +0300
commit740d158019480f41d0b1e528d0d42c9441d2c2ac (patch)
tree593440a5df388437380869ea2038d13d33f4c8a3 /app/services/ci
parent7533bda8a804e6c2d6054eef7a5c3c37c606ea21 (diff)
parentd8bf06926eb67a02bea039261589df5fd2c2fbb6 (diff)
Merge branch '10-0-stable-prepare-rc3' into '10-0-stable'
Prepare 10.0 RC3 release See merge request gitlab-org/gitlab-ce!14266
Diffstat (limited to 'app/services/ci')
-rw-r--r--app/services/ci/pipeline_trigger_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/ci/pipeline_trigger_service.rb b/app/services/ci/pipeline_trigger_service.rb
index 1e5ad28ba57..120af8c1e61 100644
--- a/app/services/ci/pipeline_trigger_service.rb
+++ b/app/services/ci/pipeline_trigger_service.rb
@@ -14,7 +14,7 @@ module Ci
pipeline = Ci::CreatePipelineService.new(project, trigger.owner, ref: params[:ref])
.execute(:trigger, ignore_skip_ci: true) do |pipeline|
- trigger.trigger_requests.create!(pipeline: pipeline)
+ pipeline.trigger_requests.create!(trigger: trigger)
create_pipeline_variables!(pipeline)
end