Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

1 files changed, 10 insertions, 0 deletions

diff --git a/lib/gitlab/ci/config/external/mapper.rb b/lib/gitlab/ci/config/external/mapper.rb
index 97ae6c4ceba..90692eafc3f 100644
--- a/lib/gitlab/ci/config/external/mapper.rb
+++ b/lib/gitlab/ci/config/external/mapper.rb
@@ -33,6 +33,7 @@ module Gitlab
             locations
               .compact
               .map(&method(:normalize_location))
+              .flat_map(&method(:expand_project_files))
               .each(&method(:verify_duplicates!))
               .map(&method(:select_first_matching))
           end
@@ -52,6 +53,15 @@ module Gitlab
             end
           end
 
+          def expand_project_files(location)
+            return location unless ::Feature.enabled?(:ci_include_multiple_files_from_project, context.project, default_enabled: true)
+            return location unless location[:project]
+
+            Array.wrap(location[:file]).map do |file|
+              location.merge(file: file)
+            end
+          end
+
           def normalize_location_string(location)
             if ::Gitlab::UrlSanitizer.valid?(location)
               { remote: location }