Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 4 deletions

diff --git a/lib/gitlab/ci/config/entry/product/variables.rb b/lib/gitlab/ci/config/entry/product/variables.rb
index aa34cfb3acc..e869e0bbb31 100644
--- a/lib/gitlab/ci/config/entry/product/variables.rb
+++ b/lib/gitlab/ci/config/entry/product/variables.rb
@@ -25,8 +25,7 @@ module Gitlab
 
             def value
               @config
-                .map { |key, value| [key.to_s, Array(value).map(&:to_s)] }
-                .to_h
+                .to_h { |key, value| [key.to_s, Array(value).map(&:to_s)] }
             end
           end
         end
diff --git a/lib/gitlab/ci/config/entry/variables.rb b/lib/gitlab/ci/config/entry/variables.rb
index dc164d752be..efb469ee32a 100644
--- a/lib/gitlab/ci/config/entry/variables.rb
+++ b/lib/gitlab/ci/config/entry/variables.rb
@@ -18,7 +18,7 @@ module Gitlab
           end
 
           def value
-            Hash[@config.map { |key, value| [key.to_s, expand_value(value)[:value]] }]
+            @config.to_h { |key, value| [key.to_s, expand_value(value)[:value]] }
           end
 
           def self.default(**)
@@ -26,7 +26,7 @@ module Gitlab
           end
 
           def value_with_data
-            Hash[@config.map { |key, value| [key.to_s, expand_value(value)] }]
+            @config.to_h { |key, value| [key.to_s, expand_value(value)] }
           end
 
           def use_value_data?