diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-22 18:14:10 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-01-22 11:38:47 -0800 |
| commit | 4c08a7b097163ec5e6b1d2feaa99ed17df2fe4f2 (patch) | |
| tree | 1cbb43c94c077798631be12b3af71e876bb0eb33 | |
| parent | e9d64e1e361dbcdeeb3ffa56cfe63a113d469723 (diff) | |
| download | gitlab-ce-4c08a7b097163ec5e6b1d2feaa99ed17df2fe4f2.tar.gz | |
Merge branch 'fix-error-500-mr-search' into 'master'
Fix Error 500 when doing a search for merge requests
Potential fix for #11547
See merge request !2525
| -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 2efa616d664..faeb2b55c6f 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)) + = search_md_sanitize(markdown(merge_request.description, { project: merge_request.project })) %span.light #{merge_request.project.name_with_namespace} .pull-right |