summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-03-31 12:38:44 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-03-31 12:38:44 +0200
commitc27b578240870b99e672266e0f7f611dde9a73a9 (patch)
tree46df1d15c54732f87f5cb2ba2ef7e5333dfefd48
parent6985e7dbf929189a7ddac536fe1215c437f9f0f5 (diff)
downloadgitlab-ce-c27b578240870b99e672266e0f7f611dde9a73a9.tar.gz
Fix event rendering for certain event types
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/helpers/events_helper.rb8
-rw-r--r--app/views/events/_event.html.haml2
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)}