diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-07 00:10:11 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-07 00:10:11 +0300 |
commit | 5de148b2f4b20e1e900cd085580ab0d7fa5f092b (patch) | |
tree | 967cfb5311a9f6a08562b9dec6bfc5345ff383db /lib/gitlab/ci/yaml_processor | |
parent | 7e75943bd8ade38611f7b953aa3b4e664bbcb7a8 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/ci/yaml_processor')
-rw-r--r-- | lib/gitlab/ci/yaml_processor/result.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ci/yaml_processor/result.rb b/lib/gitlab/ci/yaml_processor/result.rb index dd5107bad9a..a97c7050fbb 100644 --- a/lib/gitlab/ci/yaml_processor/result.rb +++ b/lib/gitlab/ci/yaml_processor/result.rb @@ -69,7 +69,7 @@ module Gitlab when: job[:when] || 'on_success', environment: job[:environment_name], coverage_regex: job[:coverage], - yaml_variables: transform_to_yaml_variables(job[:variables]), # https://gitlab.com/gitlab-org/gitlab/-/issues/300581 + # yaml_variables is calculated with using job_variables in Seed::Build job_variables: transform_to_yaml_variables(job[:job_variables]), root_variables_inheritance: job[:root_variables_inheritance], needs_attributes: job.dig(:needs, :job), |