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

1 files changed, 4 insertions, 6 deletions

diff --git a/lib/gitlab/sql/pattern.rb b/lib/gitlab/sql/pattern.rb
index d13ccde8576..cd5587bbaef 100644
--- a/lib/gitlab/sql/pattern.rb
+++ b/lib/gitlab/sql/pattern.rb
@@ -51,16 +51,14 @@ module Gitlab
 
           if words.any?
             words.map { |word| arel_column.matches(to_pattern(word, use_minimum_char_limit: use_minimum_char_limit)) }.reduce(:and)
-          else
+          elsif lower_exact_match
             # No words of at least 3 chars, but we can search for an exact
             # case insensitive match with the query as a whole
-            if lower_exact_match
-              Arel::Nodes::NamedFunction
+            Arel::Nodes::NamedFunction
                 .new('LOWER', [arel_column])
                 .eq(query)
-            else
-              arel_column.matches(sanitize_sql_like(query))
-            end
+          else
+            arel_column.matches(sanitize_sql_like(query))
           end
         end