summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/services/ci/create_pipeline_service.rb1
-rw-r--r--lib/gitlab/ci/pipeline/chain/create.rb4
-rw-r--r--lib/gitlab/ci/pipeline/chain/sequence.rb2
3 files changed, 2 insertions, 5 deletions
diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb
index af1784fe1dc..df5b32d97ca 100644
--- a/app/services/ci/create_pipeline_service.rb
+++ b/app/services/ci/create_pipeline_service.rb
@@ -28,7 +28,6 @@ module Ci
project: project,
current_user: current_user)
-
sequence = Gitlab::Ci::Pipeline::Chain::Sequence
.new(pipeline, command, SEQUENCE)
diff --git a/lib/gitlab/ci/pipeline/chain/create.rb b/lib/gitlab/ci/pipeline/chain/create.rb
index 8bd658b3069..d5e17a123df 100644
--- a/lib/gitlab/ci/pipeline/chain/create.rb
+++ b/lib/gitlab/ci/pipeline/chain/create.rb
@@ -9,9 +9,7 @@ module Gitlab
::Ci::Pipeline.transaction do
pipeline.save!
- if @command.seeds_block
- @command.seeds_block.call(pipeline)
- end
+ @command.seeds_block&.call(pipeline)
::Ci::CreatePipelineStagesService
.new(project, current_user)
diff --git a/lib/gitlab/ci/pipeline/chain/sequence.rb b/lib/gitlab/ci/pipeline/chain/sequence.rb
index e8d1ab36883..c80d583939c 100644
--- a/lib/gitlab/ci/pipeline/chain/sequence.rb
+++ b/lib/gitlab/ci/pipeline/chain/sequence.rb
@@ -13,7 +13,7 @@ module Gitlab
end
def build!
- @sequence.each do |step|
+ @sequence.each do |step|
step.perform!
break if step.break?