From 1f976a646d1439e41925ec83dc2ea92d48370831 Mon Sep 17 00:00:00 2001
From: Kyle Fazzari <gitlab_cloud@status.e4ward.com>
Date: Tue, 1 Jul 2014 06:29:58 -0700
Subject: [PATCH] Updated ATOM feed partials to use markdown instead of
 simple_format.

---
 app/views/events/_event_issue.atom.haml         | 2 +-
 app/views/events/_event_merge_request.atom.haml | 2 +-
 app/views/events/_event_note.atom.haml          | 2 +-
 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 64dc02e3f5..56801107d0 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 b7d3563f1c..dea256bb7f 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 932ba0a048..96039ad18d 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 e44b366040..17228c430c 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
-- 
2.30.9