summaryrefslogtreecommitdiff
path: root/app/views/events
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/events')
-rw-r--r--app/views/events/_event_merge_request.atom.haml2
-rw-r--r--app/views/events/_event_note.atom.haml2
2 files changed, 4 insertions, 0 deletions
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