Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 9 deletions

diff --git a/lib/gitlab/file_finder.rb b/lib/gitlab/file_finder.rb
index 95f896a74e9..8a894901ca1 100644
--- a/lib/gitlab/file_finder.rb
+++ b/lib/gitlab/file_finder.rb
@@ -44,15 +44,11 @@ module Gitlab
 
     # Overridden in Gitlab::WikiFileFinder
     def search_paths(query)
-      if Feature.enabled?(:code_basic_search_files_by_regexp, project)
-        return [] if query.blank? || ref.blank?
-
-        escaped_query = RE2::Regexp.escape(query)
-        query_regexp = Gitlab::EncodingHelper.encode_utf8_no_detect("(?i)#{escaped_query}")
-        repository.search_files_by_regexp(query_regexp, ref)
-      else
-        repository.search_files_by_name(query, ref)
-      end
+      return [] if query.blank? || ref.blank?
+
+      escaped_query = RE2::Regexp.escape(query)
+      query_regexp = Gitlab::EncodingHelper.encode_utf8_no_detect("(?i)#{escaped_query}")
+      repository.search_files_by_regexp(query_regexp, ref)
     end
   end
 end