diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb index f96c4741ba4c7f8c492cc957b986b07d92c4809e..c5a5d9fc527a32a6aa9d79ea1d36e19fea87deff 100644 --- a/app/services/ci/create_pipeline_service.rb +++ b/app/services/ci/create_pipeline_service.rb @@ -3,7 +3,7 @@ module Ci attr_reader :pipeline SEQUENCE = [Gitlab::Ci::Pipeline::Chain::Validate, - Gitlab::Ci::Pipeline::Chain::Skip] + Gitlab::Ci::Pipeline::Chain::Skip].freeze def execute(source, ignore_skip_ci: false, save_on_errors: true, trigger_request: nil, schedule: nil) @pipeline = Ci::Pipeline.new( @@ -91,7 +91,6 @@ module Ci .created_or_pending end - def before_sha params[:checkout_sha] || params[:before] || Gitlab::Git::BLANK_SHA end diff --git a/lib/gitlab/ci/pipeline/chain/validate.rb b/lib/gitlab/ci/pipeline/chain/validate.rb index 4c4c8b27be68ed3e2c82c7482e5eba38373b4de0..ec06b0f76c57de65f2c8659deb93a3caf5fc16fd 100644 --- a/lib/gitlab/ci/pipeline/chain/validate.rb +++ b/lib/gitlab/ci/pipeline/chain/validate.rb @@ -10,7 +10,7 @@ module Gitlab end def break? - @pipeline.errors.any? || @pipeline.persisted? + @pipeline.errors.any? || @pipeline.persisted? end def allowed_to_trigger_pipeline? diff --git a/spec/services/ci/create_pipeline_service_spec.rb b/spec/services/ci/create_pipeline_service_spec.rb index 5b959b9a142ed90fa1465c5bbe85f1d85063b344..6ee75b8fc235cf39b999dae84ccef69e410a48ed 100644 --- a/spec/services/ci/create_pipeline_service_spec.rb +++ b/spec/services/ci/create_pipeline_service_spec.rb @@ -481,5 +481,4 @@ describe Ci::CreatePipelineService do end end end - end