diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-14 10:15:49 +0000 |
|---|---|---|
| committer | Mark Fletcher <mark@gitlab.com> | 2018-02-14 11:50:47 +0000 |
| commit | f3af06526ad64e653183e4ffd0ea3bbdef5b1bda (patch) | |
| tree | 20150d7ccea6d7fc61fed983e478e965bf0da332 /lib/gitlab/file_finder.rb | |
| parent | ed6fd101ffe1230c9f4110950e5de2b8800ce9ba (diff) | |
| download | gitlab-ce-f3af06526ad64e653183e4ffd0ea3bbdef5b1bda.tar.gz | |
Merge branch '42934-search-api-fix' into 'master'10-5-stable-prepare-rc6
Add information about projects when searching in wiki_blobs, blobs, commits scopes
Closes #42934
See merge request gitlab-org/gitlab-ce!17095
Diffstat (limited to 'lib/gitlab/file_finder.rb')
| -rw-r--r-- | lib/gitlab/file_finder.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/gitlab/file_finder.rb b/lib/gitlab/file_finder.rb index 10ffc345bd5..8c082c0c336 100644 --- a/lib/gitlab/file_finder.rb +++ b/lib/gitlab/file_finder.rb @@ -28,7 +28,7 @@ module Gitlab def find_by_content(query) results = repository.search_files_by_content(query, ref).first(BATCH_SIZE) - results.map { |result| Gitlab::ProjectSearchResults.parse_search_result(result) } + results.map { |result| Gitlab::ProjectSearchResults.parse_search_result(result, project) } end def find_by_filename(query, except: []) @@ -45,7 +45,8 @@ module Gitlab basename: File.basename(blob.path), ref: ref, startline: 1, - data: blob.data + data: blob.data, + project: project ) end end |