From 4c08a7b097163ec5e6b1d2feaa99ed17df2fe4f2 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 22 Jan 2016 18:14:10 +0000 Subject: [PATCH] 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 --- app/views/search/results/_merge_request.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/search/results/_merge_request.html.haml b/app/views/search/results/_merge_request.html.haml index 2efa616d66..faeb2b55c6 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