Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42

1 files changed, 17 insertions, 3 deletions

diff --git a/lib/gitlab/ci/build/rules/rule/clause/changes.rb b/lib/gitlab/ci/build/rules/rule/clause/changes.rb
index 4c5f02b4f7b..1bcd87c9d93 100644
--- a/lib/gitlab/ci/build/rules/rule/clause/changes.rb
+++ b/lib/gitlab/ci/build/rules/rule/clause/changes.rb
@@ -4,8 +4,10 @@ module Gitlab
   module Ci
     module Build
       class Rules::Rule::Clause::Changes < Rules::Rule::Clause
+        include Gitlab::Utils::StrongMemoize
+
         def initialize(globs)
-          @globs = Array(globs)
+          @globs = globs
         end
 
         def satisfied_by?(pipeline, context)
@@ -19,13 +21,25 @@ module Gitlab
           end
         end
 
+        private
+
         def expand_globs(context)
-          return @globs unless context
+          return paths unless context
 
-          @globs.map do |glob|
+          paths.map do |glob|
             ExpandVariables.expand_existing(glob, -> { context.variables_hash })
           end
         end
+
+        def paths
+          strong_memoize(:paths) do
+            if @globs.is_a?(Array)
+              @globs
+            else
+              Array(@globs[:paths])
+            end
+          end
+        end
       end
     end
   end