diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-22 18:14:10 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-22 18:14:10 +0000 |
| commit | 406c9124964b7b8642eb6c0801dbf2e7448f407e (patch) | |
| tree | e1b1362e1e56c481f3ec4038c09c77944b3a1e78 | |
| parent | 0e51ca7c4841bb388c0decb57ecc64af86c77805 (diff) | |
| parent | f121d2d8f841dcc430eb2d30007fd506a1a06a04 (diff) | |
| download | gitlab-ce-406c9124964b7b8642eb6c0801dbf2e7448f407e.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 |