Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
f121d2d8
Commit
f121d2d8
authored
Jan 20, 2016
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Error 500 when doing a search for merge requests
Potential fix for #11547
parent
1553c560
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
app/views/search/results/_merge_request.html.haml
app/views/search/results/_merge_request.html.haml
+1
-1
No files found.
app/views/search/results/_merge_request.html.haml
View file @
f121d2d8
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
-
if
merge_request
.
description
.
present?
-
if
merge_request
.
description
.
present?
.description.term
.description.term
=
preserve
do
=
preserve
do
=
search_md_sanitize
(
markdown
(
merge_request
.
description
))
=
search_md_sanitize
(
markdown
(
merge_request
.
description
,
{
project:
merge_request
.
project
}
))
%span
.light
%span
.light
#{
merge_request
.
project
.
name_with_namespace
}
#{
merge_request
.
project
.
name_with_namespace
}
.pull-right
.pull-right
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment