diff options
author | Nick Thomas <nick@gitlab.com> | 2017-04-03 18:31:52 +0100 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2017-04-03 18:51:44 +0100 |
commit | 7f32ad7097b8badcad98a52b9373d67ce7f33184 (patch) | |
tree | 69959252cb083ae2b17b6a00a15cc43a03356f6f /lib/gitlab | |
parent | 872b3215d2f07a11e4b5a3dc163fc5c39423ef78 (diff) | |
download | gitlab-ce-7f32ad7097b8badcad98a52b9373d67ce7f33184.tar.gz |
Fix blob highlighting in search
Diffstat (limited to 'lib/gitlab')
-rw-r--r-- | lib/gitlab/project_search_results.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/search_results.rb | 21 |
2 files changed, 22 insertions, 1 deletions
diff --git a/lib/gitlab/project_search_results.rb b/lib/gitlab/project_search_results.rb index db325c00705..0b8959f2fb9 100644 --- a/lib/gitlab/project_search_results.rb +++ b/lib/gitlab/project_search_results.rb @@ -62,7 +62,7 @@ module Gitlab data << line.sub(ref, '').sub(filename, '').sub(/^:-\d+-/, '').sub(/^::\d+:/, '') end - OpenStruct.new( + FoundBlob.new( filename: filename, basename: basename, ref: ref, diff --git a/lib/gitlab/search_results.rb b/lib/gitlab/search_results.rb index ccfa517e04b..efe8095beea 100644 --- a/lib/gitlab/search_results.rb +++ b/lib/gitlab/search_results.rb @@ -1,5 +1,26 @@ module Gitlab class SearchResults + class FoundBlob + attr_reader :id, :filename, :basename, :ref, :startline, :data + + def initialize(opts = {}) + @id = opts.fetch(:id, nil) + @filename = opts.fetch(:filename, nil) + @basename = opts.fetch(:basename, nil) + @ref = opts.fetch(:ref, nil) + @startline = opts.fetch(:startline, nil) + @data = opts.fetch(:data, nil) + end + + def path + filename + end + + def no_highlighting? + false + end + end + attr_reader :current_user, :query # Limit search results by passed projects |