diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-29 03:09:30 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-29 03:09:30 +0300 |
| commit | a60762f1c9c446bcd3c53b363b5f87f31278d4cb (patch) | |
| tree | 5096170da07bc49cd15aed8cd8ca6607fa879e3d /lib/gitlab/ci/pipeline | |
| parent | f138af0ccd6bbea99420b435248242b417f9d476 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/ci/pipeline')
| -rw-r--r-- | lib/gitlab/ci/pipeline/chain/config/process.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ci/pipeline/chain/config/process.rb b/lib/gitlab/ci/pipeline/chain/config/process.rb index 64d1b001e3c..5548fca320f 100644 --- a/lib/gitlab/ci/pipeline/chain/config/process.rb +++ b/lib/gitlab/ci/pipeline/chain/config/process.rb @@ -35,7 +35,7 @@ module Gitlab error(result.errors.first, config_error: true) end - @pipeline.merged_yaml = result.merged_yaml + @pipeline.config_metadata = result.config_metadata rescue StandardError => ex Gitlab::ErrorTracking.track_exception(ex, |