Commit 7e59a8fe authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Improve comment search results

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 13f6dc1a
...@@ -103,4 +103,9 @@ module SearchHelper ...@@ -103,4 +103,9 @@ module SearchHelper
options = exist_opts.merge(options) options = exist_opts.merge(options)
search_path(options) search_path(options)
end end
# Sanitize html generated after parsing markdown from issue description or comment
def search_md_sanitize(html)
sanitize(html, tags: %w(a p ul li pre code))
end
end end
...@@ -22,6 +22,6 @@ ...@@ -22,6 +22,6 @@
- if @search_results.empty? - if @search_results.empty?
= render partial: "search/results/empty", locals: { message: "We couldn't find any matching results" } = render partial: "search/results/empty", locals: { message: "We couldn't find any matching results" }
%ul.bordered-list %ul.bordered-list.top-list
= render partial: "search/results/#{@scope.singularize}", collection: @objects = render partial: "search/results/#{@scope.singularize}", collection: @objects
= paginate @objects, theme: 'gitlab' = paginate @objects, theme: 'gitlab'
...@@ -31,6 +31,6 @@ ...@@ -31,6 +31,6 @@
- if @search_results.empty? - if @search_results.empty?
= render partial: "search/results/empty", locals: { message: "We couldn't find any matching results" } = render partial: "search/results/empty", locals: { message: "We couldn't find any matching results" }
%ul.bordered-list %ul.bordered-list.top-list
= render partial: "search/results/#{@scope.singularize}", collection: @objects = render partial: "search/results/#{@scope.singularize}", collection: @objects
= paginate @objects, theme: 'gitlab' = paginate @objects, theme: 'gitlab'
- project = note.project
%li %li
note on issue: %h5.note-search-caption
= link_to [note.project, note.noteable] do %i.icon-comment
%span ##{note.noteable.iid} = link_to_member(project, note.author, avatar: false)
%strong.term commented on
= truncate note.noteable.title, length: 50
%span.light (#{note.project.name_with_namespace}) - if note.for_commit?
- if note.noteable.closed? = link_to project do
%span.label Closed = project.name_with_namespace
&middot;
= link_to project_commit_path(project, note.commit_id, anchor: dom_id(note)) do
Commit #{note.commit_id[0..8]}
- else
= link_to project do
= project.name_with_namespace
&middot;
%span #{note.noteable_type.titleize} ##{note.noteable.iid}
&middot;
= link_to [project, note.noteable, anchor: dom_id(note)] do
= note.noteable.title
.note-search-result
.term
= preserve do
= search_md_sanitize(markdown(note.note, {no_header_anchors: true}))
%li %li
project: %h4
= link_to project do = link_to project do
%strong.term= project.name_with_namespace %span.term= project.name_with_namespace
- if project.description.present? - if project.description.present?
&ndash;
%span.light.term= project.description %span.light.term= project.description
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment