summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-12-14 19:33:33 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-12-14 19:33:33 +0200
commit678e5355a3e43aa2a13d109fe5d75de231eef413 (patch)
tree8ef7a4574d6cd85d1c9e2090da529da44941cf3a /app/views
parent190e483fb4b5edb6d8dfa71b67dc52da402ddab9 (diff)
downloadgitlab-ce-678e5355a3e43aa2a13d109fe5d75de231eef413.tar.gz
Create events on comments and milestone
Diffstat (limited to 'app/views')
-rw-r--r--app/views/events/_event.html.haml2
-rw-r--r--app/views/events/event/_note.html.haml16
2 files changed, 18 insertions, 0 deletions
diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml
index 2446b764e4d..9625e1e20de 100644
--- a/app/views/events/_event.html.haml
+++ b/app/views/events/_event.html.haml
@@ -5,6 +5,8 @@
- if event.push?
= render "events/event/push", event: event
+ - if event.note?
+ = render "events/event/note", event: event
- else
= render "events/event/common", event: event
diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml
new file mode 100644
index 00000000000..5dddef1f1ac
--- /dev/null
+++ b/app/views/events/event/_note.html.haml
@@ -0,0 +1,16 @@
+.event-title
+ %span.author_name= link_to_author event
+ %span.event_label commented on #{event.target.noteable_type_name}
+ - if event.target and event.target.noteable_id
+ = link_to [event.project, event.target.noteable] do
+ %strong= truncate event.target.noteable_id
+ - else
+ %strong (deleted)
+ at
+ - if event.project
+ = link_to_project event.project
+ - else
+ = event.project_name
+
+.event-body
+ %p.hint= truncate event.target.note, length: 70