diff options
author | Valery Sizov <valery@gitlab.com> | 2017-05-12 10:16:33 +0300 |
---|---|---|
committer | Valery Sizov <valery@gitlab.com> | 2017-05-12 13:21:30 +0300 |
commit | f6c4ccd1f234e1b5bab8f7ffbd98b3d1092b4873 (patch) | |
tree | cf4c5e58d875d78724ab84daa7328b6bc54ab68d /lib/gitlab/project_search_results.rb | |
parent | 180ec7113e358a7f8388e1436dc0670a11ba68df (diff) |
Backport FileFinder from EE
Diffstat (limited to 'lib/gitlab/project_search_results.rb')
-rw-r--r-- | lib/gitlab/project_search_results.rb | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/lib/gitlab/project_search_results.rb b/lib/gitlab/project_search_results.rb index 47cfe412715..561aa9e162c 100644 --- a/lib/gitlab/project_search_results.rb +++ b/lib/gitlab/project_search_results.rb @@ -84,23 +84,7 @@ module Gitlab def blobs return [] unless Ability.allowed?(@current_user, :download_code, @project) - @blobs ||= begin - blobs = project.repository.search_files_by_content(query, repository_ref).first(100) - found_file_names = Set.new - - results = blobs.map do |blob| - blob = self.class.parse_search_result(blob) - found_file_names << blob.filename - - [blob.filename, blob] - end - - project.repository.search_files_by_name(query, repository_ref).first(100).each do |filename| - results << [filename, nil] unless found_file_names.include?(filename) - end - - results.sort_by(&:first) - end + @blobs ||= Gitlab::FileFinder.new(project, repository_ref).find(query) end def wiki_blobs |