Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

1 files changed, 10 insertions, 8 deletions

diff --git a/spec/support/matchers/exceed_query_limit.rb b/spec/support/matchers/exceed_query_limit.rb
index 6d7658b7c33..a5a017828b3 100644
--- a/spec/support/matchers/exceed_query_limit.rb
+++ b/spec/support/matchers/exceed_query_limit.rb
@@ -63,14 +63,16 @@ module ExceedQueryLimitHelpers
     end
   end
 
-  MARGINALIA_ANNOTATION_REGEX = %r{\s*\/\*.*\*\/}.freeze
-
-  DB_QUERY_RE = Regexp.union([
-    /^(?<prefix>SELECT .* FROM "?[a-z_]+"?) (?<suffix>.*)$/m,
-    /^(?<prefix>UPDATE "?[a-z_]+"?) (?<suffix>.*)$/m,
-    /^(?<prefix>INSERT INTO "[a-z_]+" \((?:"[a-z_]+",?\s?)+\)) (?<suffix>.*)$/m,
-    /^(?<prefix>DELETE FROM "[a-z_]+") (?<suffix>.*)$/m
-  ]).freeze
+  MARGINALIA_ANNOTATION_REGEX = %r{\s*/\*.*\*/}.freeze
+
+  DB_QUERY_RE = Regexp.union(
+    [
+      /^(?<prefix>SELECT .* FROM "?[a-z_]+"?) (?<suffix>.*)$/m,
+      /^(?<prefix>UPDATE "?[a-z_]+"?) (?<suffix>.*)$/m,
+      /^(?<prefix>INSERT INTO "[a-z_]+" \((?:"[a-z_]+",?\s?)+\)) (?<suffix>.*)$/m,
+      /^(?<prefix>DELETE FROM "[a-z_]+") (?<suffix>.*)$/m
+    ]
+  ).freeze
 
   def with_threshold(threshold)
     @threshold = threshold