Merge branch 'sh-fix-ci-lint-500-error' into 'master'

Fix 500 error in CI lint when included templates are an array

Closes #66605

See merge request gitlab-org/gitlab-ce!32232

1 files changed, 7 insertions, 1 deletions

diff --git a/lib/gitlab/ci/config/external/file/base.rb b/lib/gitlab/ci/config/external/file/base.rb
index 2ffbb214a92..c56d33544ba 100644
--- a/lib/gitlab/ci/config/external/file/base.rb
+++ b/lib/gitlab/ci/config/external/file/base.rb
@@ -26,6 +26,10 @@ module Gitlab
               location.present?
             end
 
+            def invalid_location_type?
+              !location.is_a?(String)
+            end
+
             def invalid_extension?
               location.nil? || !::File.basename(location).match?(YAML_WHITELIST_EXTENSION)
             end
@@ -71,7 +75,9 @@ module Gitlab
             end
 
             def validate_location!
-              if invalid_extension?
+              if invalid_location_type?
+                errors.push("Included file `#{location}` needs to be a string")
+              elsif invalid_extension?
                 errors.push("Included file `#{location}` does not have YAML extension!")
               end
             end