diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-07-23 08:17:30 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-07-23 08:17:30 +0000 |
| commit | 8a539e58c8f56881094edd435170147d99e1e438 (patch) | |
| tree | 665ab817685774e54cad767fba24027f03878ef0 | |
| parent | db69c7325ce0fb160dbfc0716dcc09e02750b354 (diff) | |
| parent | 4466f25dd52e7eb9230b7d16d8d4103ebd900cc6 (diff) | |
| download | gitlab-ce-8a539e58c8f56881094edd435170147d99e1e438.tar.gz | |
Merge branch 'revert_even_cache' into 'master'
Revert cache for events
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1014#note_1661322
See merge request !1027
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/events/_event.html.haml | 15 |
2 files changed, 8 insertions, 8 deletions
diff --git a/CHANGELOG b/CHANGELOG index 1ba9d9f308c..7ddddac014f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -14,6 +14,7 @@ v 7.14.0 (unreleased) v 7.13.1 - Revert issue caching + - 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 |