summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-07-22 17:03:57 +0300
committerValery Sizov <vsv2711@gmail.com>2015-07-23 11:19:17 +0300
commit8d1ccf7e3a57da49b01d5317ea19d131e9508917 (patch)
treef444ed2610acfccd23e0ba12893d05d389a37b70
parentb50f5f9051c10cb37054f75a10e419267be2233f (diff)
downloadgitlab-ce-8d1ccf7e3a57da49b01d5317ea19d131e9508917.tar.gz
revert cache for events
-rw-r--r--CHANGELOG1
-rw-r--r--app/views/events/_event.html.haml15
2 files changed, 8 insertions, 8 deletions
diff --git a/CHANGELOG b/CHANGELOG
index d5b3cbaf31c..1a81400a354 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@ v 7.13.1
- Revert issue caching
- Improve documentation
- Fix of migration: Check if session_expire_delay column exists before adding the column
+ - Reverted cache for events
v 7.13.0 (unreleased)
- Remove repository graph log to fix slow cache updates after push event (Stan Hu)
diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml
index b8409f64665..5ab5ffc238c 100644
--- a/app/views/events/_event.html.haml
+++ b/app/views/events/_event.html.haml
@@ -8,11 +8,10 @@
= image_tag avatar_icon(event.author_email, 24), class: "avatar s24", alt:''
= render "events/event/created_project", event: event
- else
- = cache event do
- = image_tag avatar_icon(event.author_email, 24), class: "avatar s24", alt:''
- - if event.push?
- = render "events/event/push", event: event
- - elsif event.commented?
- = render "events/event/note", event: event
- - else
- = render "events/event/common", event: event
+ = image_tag avatar_icon(event.author_email, 24), class: "avatar s24", alt:''
+ - if event.push?
+ = render "events/event/push", event: event
+ - elsif event.commented?
+ = render "events/event/note", event: event
+ - else
+ = render "events/event/common", event: event