diff options
| author | Kyle Fazzari <gitlab_cloud@status.e4ward.com> | 2014-07-01 17:29:58 +0400 |
|---|---|---|
| committer | Kyle Fazzari <gitlab_cloud@status.e4ward.com> | 2014-07-01 17:29:58 +0400 |
| commit | 1f976a646d1439e41925ec83dc2ea92d48370831 (patch) | |
| tree | 30397ebc98072ee182382b9fa8d70b9a3101d197 | |
| parent | c1b1c321962de51090d590dc40fc2784aaa0d561 (diff) | |
Updated ATOM feed partials to use markdown instead of simple_format.
| -rw-r--r-- | app/views/events/_event_issue.atom.haml | 2 | ||||
| -rw-r--r-- | app/views/events/_event_merge_request.atom.haml | 2 | ||||
| -rw-r--r-- | app/views/events/_event_note.atom.haml | 2 | ||||
| -rw-r--r-- | app/views/events/_event_push.atom.haml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/app/views/events/_event_issue.atom.haml b/app/views/events/_event_issue.atom.haml index 64dc02e3f56..56801107d05 100644 --- a/app/views/events/_event_issue.atom.haml +++ b/app/views/events/_event_issue.atom.haml @@ -1,2 +1,2 @@ %div{:xmlns => "http://www.w3.org/1999/xhtml"} - %p= simple_format issue.description + %p= markdown issue.description diff --git a/app/views/events/_event_merge_request.atom.haml b/app/views/events/_event_merge_request.atom.haml index b7d3563f1c1..dea256bb7f2 100644 --- a/app/views/events/_event_merge_request.atom.haml +++ b/app/views/events/_event_merge_request.atom.haml @@ -1,2 +1,2 @@ %div{xmlns: "http://www.w3.org/1999/xhtml"} - %p= simple_format merge_request.description + %p= markdown merge_request.description diff --git a/app/views/events/_event_note.atom.haml b/app/views/events/_event_note.atom.haml index 932ba0a0483..96039ad18dc 100644 --- a/app/views/events/_event_note.atom.haml +++ b/app/views/events/_event_note.atom.haml @@ -1,2 +1,2 @@ %div{:xmlns => "http://www.w3.org/1999/xhtml"} - %p= simple_format note.note + %p= markdown note.note diff --git a/app/views/events/_event_push.atom.haml b/app/views/events/_event_push.atom.haml index e44b366040f..17228c430ca 100644 --- a/app/views/events/_event_push.atom.haml +++ b/app/views/events/_event_push.atom.haml @@ -6,7 +6,7 @@ %i at = commit[:timestamp].to_time.to_s(:short) - %blockquote= simple_format(escape_once(commit[:message])) + %blockquote= markdown(escape_once(commit[:message])) - if event.commits_count > 15 %p %i |