From c1b1c321962de51090d590dc40fc2784aaa0d561 Mon Sep 17 00:00:00 2001
From: Kyle Fazzari <gitlab_cloud@status.e4ward.com>
Date: Thu, 29 May 2014 07:55:55 -0700
Subject: [PATCH 1/2] Add summaries for notes and merge requests to dashboard
 feed.

This fixes #305.
---
 app/helpers/events_helper.rb                    | 4 ++++
 app/models/event.rb                             | 5 +++++
 app/views/events/_event_merge_request.atom.haml | 2 ++
 app/views/events/_event_note.atom.haml          | 2 ++
 4 files changed, 13 insertions(+)
 create mode 100644 app/views/events/_event_merge_request.atom.haml
 create mode 100644 app/views/events/_event_note.atom.haml

diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 929f9a9c381..63210324a19 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -83,6 +83,10 @@ module EventsHelper
       render "events/event_issue", issue: event.issue
     elsif event.push?
       render "events/event_push", event: event
+    elsif event.merge_request?
+      render "events/event_merge_request", merge_request: event.merge_request
+    elsif event.note?
+      render "events/event_note", note: event.note
     end
   end
 
diff --git a/app/models/event.rb b/app/models/event.rb
index cf88e9f4afc..3c8b9ac1736 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -33,6 +33,7 @@ class Event < ActiveRecord::Base
   delegate :name, :email, to: :author, prefix: true, allow_nil: true
   delegate :title, to: :issue, prefix: true, allow_nil: true
   delegate :title, to: :merge_request, prefix: true, allow_nil: true
+  delegate :title, to: :note, prefix: true, allow_nil: true
 
   belongs_to :author, class_name: "User"
   belongs_to :project
@@ -147,6 +148,10 @@ class Event < ActiveRecord::Base
     target if target_type == "MergeRequest"
   end
 
+  def note
+    target if target_type == "Note"
+  end
+
   def action_name
     if closed?
       "closed"
diff --git a/app/views/events/_event_merge_request.atom.haml b/app/views/events/_event_merge_request.atom.haml
new file mode 100644
index 00000000000..b7d3563f1c1
--- /dev/null
+++ b/app/views/events/_event_merge_request.atom.haml
@@ -0,0 +1,2 @@
+%div{xmlns: "http://www.w3.org/1999/xhtml"}
+  %p= simple_format merge_request.description
diff --git a/app/views/events/_event_note.atom.haml b/app/views/events/_event_note.atom.haml
new file mode 100644
index 00000000000..932ba0a0483
--- /dev/null
+++ b/app/views/events/_event_note.atom.haml
@@ -0,0 +1,2 @@
+%div{:xmlns => "http://www.w3.org/1999/xhtml"}
+  %p= simple_format note.note

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 2/2] 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 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