diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-22 11:02:21 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-22 11:02:26 +0200 |
| commit | adba37f99aa6351ce7ca29055d5aab284058bc2e (patch) | |
| tree | c528f850f4784835c9669849dc3a41cafc906143 | |
| parent | f65840bc842b86cd71e70af8b9acdb1a786d9054 (diff) | |
| download | gitlab-ce-adba37f99aa6351ce7ca29055d5aab284058bc2e.tar.gz | |
Use markdown with gfm pipeline rather than gfm method
| -rw-r--r-- | app/views/projects/commits/show.atom.builder | 2 | ||||
| -rw-r--r-- | app/views/projects/issues/_closed_by_box.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/commits/show.atom.builder b/app/views/projects/commits/show.atom.builder index 3854ad5d611..7aab98e07c4 100644 --- a/app/views/projects/commits/show.atom.builder +++ b/app/views/projects/commits/show.atom.builder @@ -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 diff --git a/app/views/projects/issues/_closed_by_box.html.haml b/app/views/projects/issues/_closed_by_box.html.haml index aef352029d0..eebe36bc441 100644 --- a/app/views/projects/issues/_closed_by_box.html.haml +++ b/app/views/projects/issues/_closed_by_box.html.haml @@ -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. |