Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 4 insertions, 3 deletions

diff --git a/lib/gitlab/graphql/queries.rb b/lib/gitlab/graphql/queries.rb
index 74f55abccbc..5d3a9245427 100644
--- a/lib/gitlab/graphql/queries.rb
+++ b/lib/gitlab/graphql/queries.rb
@@ -264,7 +264,7 @@ module Gitlab
         definitions = []
 
         ::Find.find(root.to_s) do |path|
-          definitions << Definition.new(path, fragments) if query?(path)
+          definitions << Definition.new(path, fragments) if query_for_gitlab_schema?(path)
         end
 
         definitions
@@ -288,10 +288,11 @@ module Gitlab
         @known_failures.fetch('filenames', []).any? { |known_failure| path.to_s.ends_with?(known_failure) }
       end
 
-      def self.query?(path)
+      def self.query_for_gitlab_schema?(path)
         path.ends_with?('.graphql') &&
           !path.ends_with?('.fragment.graphql') &&
-          !path.ends_with?('typedefs.graphql')
+          !path.ends_with?('typedefs.graphql') &&
+          !/.*\.customer\.(query|mutation)\.graphql$/.match?(path)
       end
     end
   end