diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/project_search_results.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/search_results.rb | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/lib/gitlab/project_search_results.rb b/lib/gitlab/project_search_results.rb index 3a202d915e3..04df881bf03 100644 --- a/lib/gitlab/project_search_results.rb +++ b/lib/gitlab/project_search_results.rb @@ -82,7 +82,7 @@ module Gitlab ref: ref, startline: startline, data: data.join, - project_id: project ? project.id : nil + project: project ) end diff --git a/lib/gitlab/search_results.rb b/lib/gitlab/search_results.rb index 6c86ad11385..b46c18c4364 100644 --- a/lib/gitlab/search_results.rb +++ b/lib/gitlab/search_results.rb @@ -5,8 +5,9 @@ module Gitlab class FoundBlob include EncodingHelper include Presentable + include BlobLanguageFromGitAttributes - attr_reader :id, :filename, :basename, :ref, :startline, :data, :project_id + attr_reader :id, :filename, :basename, :ref, :startline, :data, :project def initialize(opts = {}) @id = opts.fetch(:id, nil) @@ -16,17 +17,15 @@ module Gitlab @startline = opts.fetch(:startline, nil) @data = encode_utf8(opts.fetch(:data, nil)) @per_page = opts.fetch(:per_page, 20) - @project_id = opts.fetch(:project_id, nil) + @project = opts.fetch(:project, nil) end def path filename end - # Since search results often contain many items, - # not triggering lookup can avoid n+1 queries. - def language_from_gitattributes - nil + def project_id + @project&.id end def present |