diff options
| author | Kyle Fazzari <gitlab_cloud@status.e4ward.com> | 2014-05-29 07:55:55 -0700 |
|---|---|---|
| committer | Kyle Fazzari <gitlab_cloud@status.e4ward.com> | 2014-05-29 07:55:55 -0700 |
| commit | c1b1c321962de51090d590dc40fc2784aaa0d561 (patch) | |
| tree | fd15124703486490f2ee7836064dcc0b85633fd4 /app/views/events | |
| parent | b1ce97d5a1b3890e4137212547d97f3ab38c3991 (diff) | |
| download | gitlab-ce-c1b1c321962de51090d590dc40fc2784aaa0d561.tar.gz | |
Add summaries for notes and merge requests to dashboard feed.
This fixes #305.
Diffstat (limited to 'app/views/events')
| -rw-r--r-- | app/views/events/_event_merge_request.atom.haml | 2 | ||||
| -rw-r--r-- | app/views/events/_event_note.atom.haml | 2 |
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 |