Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 3 deletions

diff --git a/lib/gitlab/ci/build/context/build.rb b/lib/gitlab/ci/build/context/build.rb
index dfd86d3ad72..641aa71fb4e 100644
--- a/lib/gitlab/ci/build/context/build.rb
+++ b/lib/gitlab/ci/build/context/build.rb
@@ -21,7 +21,7 @@ module Gitlab
               # to the CI variables to evaluate rules before we persist a Build
               # with the result. We should refactor away the extra Build.new,
               # but be able to get CI Variables directly from the Seed::Build.
-              stub_build.scoped_variables_hash
+              stub_build.scoped_variables
             end
           end
 
diff --git a/lib/gitlab/ci/build/context/global.rb b/lib/gitlab/ci/build/context/global.rb
index fdd3ac358d5..dd0bc54d8b2 100644
--- a/lib/gitlab/ci/build/context/global.rb
+++ b/lib/gitlab/ci/build/context/global.rb
@@ -19,8 +19,7 @@ module Gitlab
               # to the CI variables to evaluate workflow:rules
               # with the result. We should refactor away the extra Build.new,
               # but be able to get CI Variables directly from the Seed::Build.
-              stub_build.scoped_variables_hash
-                .reject { |key, _value| key =~ /\ACI_(JOB|BUILD)/ }
+              stub_build.scoped_variables.reject { |var| var[:key] =~ /\ACI_(JOB|BUILD)/ }
             end
           end