Commit d851833f authored by Marius Bobin's avatar Marius Bobin

Remove ci_pre_post_pipeline_stages feature flag

parent a5004c79
...@@ -76,10 +76,7 @@ module Gitlab ...@@ -76,10 +76,7 @@ module Gitlab
initial_config = Gitlab::Config::Loader::Yaml.new(config).load! initial_config = Gitlab::Config::Loader::Yaml.new(config).load!
initial_config = Config::External::Processor.new(initial_config, @context).perform initial_config = Config::External::Processor.new(initial_config, @context).perform
initial_config = Config::Extendable.new(initial_config).to_hash initial_config = Config::Extendable.new(initial_config).to_hash
initial_config = Config::EdgeStagesInjector.new(initial_config).to_hash
if Feature.enabled?(:ci_pre_post_pipeline_stages, @context.project, default_enabled: true)
initial_config = Config::EdgeStagesInjector.new(initial_config).to_hash
end
initial_config initial_config
end end
......
...@@ -79,26 +79,6 @@ describe Gitlab::Ci::Config do ...@@ -79,26 +79,6 @@ describe Gitlab::Ci::Config do
it { is_expected.to eq %w[.pre stage1 stage2 .post] } it { is_expected.to eq %w[.pre stage1 stage2 .post] }
end end
context 'with feature disabled' do
before do
stub_feature_flags(ci_pre_post_pipeline_stages: false)
end
let(:yml) do
<<-EOS
stages:
- stage1
- stage2
job1:
stage: stage1
script:
- ls
EOS
end
it { is_expected.to eq %w[stage1 stage2] }
end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment