diff options
| author | Nick Thomas <nick@gitlab.com> | 2016-10-06 22:55:27 +0100 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2016-10-07 02:54:26 +0100 |
| commit | dd159a750b294ee89cb8a4143284ff9788b639fc (patch) | |
| tree | b70548ebd7173130a5c32903874f527175943671 /app/views/search/results/_merge_request.html.haml | |
| parent | 109816c42fbe44fca108b52308a5fa4366876216 (diff) | |
| download | gitlab-ce-dd159a750b294ee89cb8a4143284ff9788b639fc.tar.gz | |
Make search results use the markdown cache columns, treating them consistently
Truncato is introduced as a dependency to intelligently shorten the rendered
HTML to 200 characters; the previous approach could have resulted in invalid
HTML being rendered.
Diffstat (limited to 'app/views/search/results/_merge_request.html.haml')
| -rw-r--r-- | app/views/search/results/_merge_request.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/search/results/_merge_request.html.haml b/app/views/search/results/_merge_request.html.haml index 6331c2bd6b0..07b17bc69c0 100644 --- a/app/views/search/results/_merge_request.html.haml +++ b/app/views/search/results/_merge_request.html.haml @@ -6,7 +6,7 @@ - if merge_request.description.present? .description.term = preserve do - = search_md_sanitize(markdown(merge_request.description, { project: merge_request.project, author: merge_request.author })) + = search_md_sanitize(merge_request, :description) %span.light #{merge_request.project.name_with_namespace} .pull-right |