summaryrefslogtreecommitdiff
path: root/app/views/search
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-08-27 12:47:30 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-08-27 12:47:30 +0300
commit8b00d01c6711918951a7951cff3e57660c807ae7 (patch)
tree239769fdd7f330078b4ba524c8a2e07a810675cc /app/views/search
parent7e59a8fee8c89d6217bd48bf1050526f59cb96aa (diff)
downloadgitlab-ce-8b00d01c6711918951a7951cff3e57660c807ae7.tar.gz
Search by issue/mr title and description
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/search')
-rw-r--r--app/views/search/results/_issue.html.haml3
-rw-r--r--app/views/search/results/_merge_request.html.haml3
2 files changed, 6 insertions, 0 deletions
diff --git a/app/views/search/results/_issue.html.haml b/app/views/search/results/_issue.html.haml
index 7579c99c9ed..94234a83a71 100644
--- a/app/views/search/results/_issue.html.haml
+++ b/app/views/search/results/_issue.html.haml
@@ -3,6 +3,9 @@
= link_to [issue.project, issue] do
%span.term.str-truncated= issue.title
.pull-right ##{issue.iid}
+ .description.term
+ = preserve do
+ = search_md_sanitize(markdown(issue.description))
%span.light
#{issue.project.name_with_namespace}
- if issue.closed?
diff --git a/app/views/search/results/_merge_request.html.haml b/app/views/search/results/_merge_request.html.haml
index 96a2e722ba3..fce996343d8 100644
--- a/app/views/search/results/_merge_request.html.haml
+++ b/app/views/search/results/_merge_request.html.haml
@@ -3,6 +3,9 @@
= link_to [merge_request.target_project, merge_request] do
%span.term.str-truncated= merge_request.title
.pull-right ##{merge_request.iid}
+ .description.term
+ = preserve do
+ = search_md_sanitize(markdown(merge_request.description))
%span.light
#{merge_request.project.name_with_namespace}
.pull-right