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

Merge branch 'fix-error-500-mr-search' into 'master'
406c9124 · Dmitriy Zaporozhets · 0e51ca7c · f121d2d8 · 406c9124
Commit 406c9124 authored Jan 22, 2016 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

_merge_request.html.haml app/views/search/results/_merge_request.html.haml +1 -1

No files found.
--- 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