diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 15:09:10 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 15:09:10 +0000 |
| commit | 8e129497b2565b8c595ef4f806d9a9595ca654e5 (patch) | |
| tree | 7afeeca3ea58013c1e8c3a2055661bacf65577da /lib/gitlab | |
| parent | 8ae26d705abe341b03bc15d4373d6cd0c77c0baf (diff) | |
| download | gitlab-ce-8e129497b2565b8c595ef4f806d9a9595ca654e5.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/ci/config.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/gitlab/ci/config.rb b/lib/gitlab/ci/config.rb index e069f734e32..10e0f4b8e4d 100644 --- a/lib/gitlab/ci/config.rb +++ b/lib/gitlab/ci/config.rb @@ -76,10 +76,7 @@ module Gitlab initial_config = Gitlab::Config::Loader::Yaml.new(config).load! initial_config = Config::External::Processor.new(initial_config, @context).perform initial_config = Config::Extendable.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 = Config::EdgeStagesInjector.new(initial_config).to_hash initial_config end |