Add latest changes from gitlab-org/gitlab@master

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