Fix incorrectly resolved conflict in pipeline service

2add4765 · Grzegorz Bizon · da47ce00 · 2add4765
Commit 2add4765 authored Mar 22, 2018 by Grzegorz Bizon
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

app/services/ci/create_pipeline_service.rb app/services/ci/create_pipeline_service.rb +0 -1

No files found.
--- a/app/services/ci/create_pipeline_service.rb
+++ b/app/services/ci/create_pipeline_service.rb
@@ -12,7 +12,6 @@ module Ci
                Gitlab::Ci::Pipeline::Chain::Populate,
                Gitlab::Ci::Pipeline::Chain::Create,
                EE::Gitlab::Ci::Pipeline::Chain::Limit::Activity].freeze
-                Gitlab::Ci::Pipeline::Chain::Create].freeze

    def execute(source, ignore_skip_ci: false, save_on_errors: true, trigger_request: nil, schedule: nil, mirror_update: false, &block)
      @pipeline = Ci::Pipeline.new