diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-12-05 13:32:39 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-12-05 13:32:39 +0300 |
| commit | fb048d2cf5597a24dccaf02c4db5f6747214742c (patch) | |
| tree | 1aeeeb8518dd92a8ff2dc6b9c748f2bd16c2f0b7 /lib | |
| parent | 07779a463af4b09aea77f027a9cd8dcddaa6eebe (diff) | |
| parent | 08e50c996c2d427618f1714d99f412514393dd92 (diff) | |
Merge branch 'mr-pipelines-2' into 'master'
Merge request pipelines
See merge request gitlab-org/gitlab-ce!23217
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ci/pipeline/chain/build.rb | 1 | ||||
| -rw-r--r-- | lib/gitlab/ci/pipeline/chain/command.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/ci/pipeline/chain/build.rb b/lib/gitlab/ci/pipeline/chain/build.rb index b445a872b3d..d33d1edfe35 100644 --- a/lib/gitlab/ci/pipeline/chain/build.rb +++ b/lib/gitlab/ci/pipeline/chain/build.rb @@ -16,6 +16,7 @@ module Gitlab trigger_requests: Array(@command.trigger_request), user: @command.current_user, pipeline_schedule: @command.schedule, + merge_request: @command.merge_request, protected: @command.protected_ref?, variables_attributes: Array(@command.variables_attributes) ) diff --git a/lib/gitlab/ci/pipeline/chain/command.rb b/lib/gitlab/ci/pipeline/chain/command.rb index 05978804d92..100b9521412 100644 --- a/lib/gitlab/ci/pipeline/chain/command.rb +++ b/lib/gitlab/ci/pipeline/chain/command.rb @@ -8,7 +8,7 @@ module Gitlab Command = Struct.new( :source, :project, :current_user, :origin_ref, :checkout_sha, :after_sha, :before_sha, - :trigger_request, :schedule, + :trigger_request, :schedule, :merge_request, :ignore_skip_ci, :save_incompleted, :seeds_block, :variables_attributes ) do |