diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-31 11:34:26 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-03-31 11:34:26 +0000 |
| commit | c3875b5f7517e5d170f3028f98490c22d6eac872 (patch) | |
| tree | 37d443563203dcd58cd80b2ce75ee7da38cd886c | |
| parent | 403b7fe11a772242d3a2434226d93c7552f45668 (diff) | |
| parent | c27b578240870b99e672266e0f7f611dde9a73a9 (diff) | |
| download | gitlab-ce-c3875b5f7517e5d170f3028f98490c22d6eac872.tar.gz | |
Merge branch 'fix-event-row' into 'master'
Fix event rendering for certain event types
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !3469
| -rw-r--r-- | app/helpers/events_helper.rb | 8 | ||||
| -rw-r--r-- | app/views/events/_event.html.haml | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index d3e5e3aa8b9..a36b13a7db5 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -214,4 +214,12 @@ module EventsHelper end end end + + def event_row_class(event) + if event.body? || event.created_project? + "event-block" + else + "event-inline" + end + end end diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml index 42c2764e7e2..4d20dd5830e 100644 --- a/app/views/events/_event.html.haml +++ b/app/views/events/_event.html.haml @@ -1,5 +1,5 @@ - if event.visible_to_user?(current_user) - .event-item{class: "#{event.body? ? "event-block" : "event-inline" }"} + .event-item{ class: event_row_class(event) } .event-item-timestamp #{time_ago_with_tooltip(event.created_at)} |