summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-10 11:17:05 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-10 11:17:05 +0000
commit3752172dcda1c655e61c1eec3d227732c3f535b2 (patch)
tree0b821efa2f0cf434449f81e2a6c028be949bd760
parent77f37fa9094443abe8e60ebd09a82e94d0a0047b (diff)
parent0d1c260122325909106f9cef4dfe8b8e31857dc5 (diff)
downloadgitlab-ce-3752172dcda1c655e61c1eec3d227732c3f535b2.tar.gz
Merge branch 'fix-event-cache' into 'master'
Fix event cache Fixes #2236. See merge request !1128
-rw-r--r--app/views/events/_event.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml
index 0377760a9b8..0faab4458e9 100644
--- a/app/views/events/_event.html.haml
+++ b/app/views/events/_event.html.haml
@@ -3,7 +3,7 @@
.event-item-timestamp
#{time_ago_with_tooltip(event.created_at)}
- = cache event, "v1" do
+ = cache [event, "v1"] do
= image_tag avatar_icon(event.author_email, 24), class: "avatar s24", alt:''
- if event.created_project?
= render "events/event/created_project", event: event