diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 15:07:33 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 15:07:33 +0300 |
| commit | 6b75320f525f841454f1ab162d141d3610f2e77b (patch) | |
| tree | 4971c27759e4fbc18b85e71800c3b9c12346317e /lib/gitlab/ci/config.rb | |
| parent | 4226aca420920c1844e8eade4798a2dff188a6fc (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/ci/config.rb')
| -rw-r--r-- | lib/gitlab/ci/config.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/gitlab/ci/config.rb b/lib/gitlab/ci/config.rb index 342dcb2f784..9c1e6277e95 100644 --- a/lib/gitlab/ci/config.rb +++ b/lib/gitlab/ci/config.rb @@ -78,8 +78,13 @@ module Gitlab def build_config(config) 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 - 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 end def build_context(project:, sha:, user:) |