kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Use markdown with gfm pipeline rather than gfm method

This commit is contained in:
Douwe Maan 2015-10-22 11:02:21 +02:00
parent f65840bc84
commit adba37f99a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/projects/commits/show.atom.builder
View File

@ -17,7 +17,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://sear
xml.name commit.author_name
xml.email commit.author_email
end
xml.summary gfm(commit.description)
xml.summary markdown(commit.description, pipeline: :atom)
end
end
end

2
app/views/projects/issues/_closed_by_box.html.haml
View File

@ -1,3 +1,3 @@
.issue-closed-by-widget
= icon('check')
This issue will be closed automatically when merge request #{gfm(merge_requests_sentence(@closed_by_merge_requests.sort))} is accepted.
This issue will be closed automatically when merge request #{markdown(merge_requests_sentence(@closed_by_merge_requests.sort), pipeline: :gfm)} is accepted.