Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 7 deletions

diff --git a/lib/gitlab/ci/variables/collection/sorted.rb b/lib/gitlab/ci/variables/collection/sorted.rb
index e641df10462..efa9e3bdfc4 100644
--- a/lib/gitlab/ci/variables/collection/sorted.rb
+++ b/lib/gitlab/ci/variables/collection/sorted.rb
@@ -8,8 +8,11 @@ module Gitlab
           include TSort
           include Gitlab::Utils::StrongMemoize
 
-          def initialize(variables, project)
-            @variables = variables
+          def initialize(collection, project)
+            raise(ArgumentError, "A Gitlab::Ci::Variables::Collection object was expected") unless
+              collection.is_a?(Collection)
+
+            @collection = collection
             @project = project
           end
 
@@ -35,16 +38,16 @@ module Gitlab
           # sort sorts an array of variables, ignoring unknown variable references.
           # If a circular variable reference is found, the original array is returned
           def sort
-            return @variables if Feature.disabled?(:variable_inside_variable, @project)
-            return @variables if errors
+            return @collection if Feature.disabled?(:variable_inside_variable, @project)
+            return @collection if errors
 
-            tsort
+            Gitlab::Ci::Variables::Collection.new(tsort)
           end
 
           private
 
           def tsort_each_node(&block)
-            @variables.each(&block)
+            @collection.each(&block)
           end
 
           def tsort_each_child(variable, &block)
@@ -53,7 +56,7 @@ module Gitlab
 
           def input_vars
             strong_memoize(:input_vars) do
-              @variables.index_by { |env| env.fetch(:key) }
+              @collection.index_by { |env| env[:key] }
             end
           end