diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-07 18:09:56 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-07 18:09:56 +0300 |
commit | 79f98200f84590af39cf1af7f57f6e8ba89d2bb6 (patch) | |
tree | 289fadec4d3f96a681b3938debaf3800806471ff /lib/gitlab/ci/yaml_processor | |
parent | de8e5077c3671b0b29642faf1b5e562bc4f99453 (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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab/ci/yaml_processor/result.rb b/lib/gitlab/ci/yaml_processor/result.rb index 460fad16d5c..15cc0c28296 100644 --- a/lib/gitlab/ci/yaml_processor/result.rb +++ b/lib/gitlab/ci/yaml_processor/result.rb @@ -112,7 +112,9 @@ module Gitlab end def yaml_variables_for(job_name) - job = jobs.fetch(job_name) + job = jobs[job_name] + + return [] unless job Gitlab::Ci::Variables::Helpers.inherit_yaml_variables( from: root_variables, @@ -122,9 +124,7 @@ module Gitlab end def stage_for(job_name) - job = jobs.fetch(job_name) - - job[:stage] + jobs.dig(job_name, :stage) end private |