Commit 8a539e58 authored by Valery Sizov's avatar Valery Sizov

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
parents db69c732 4466f25d
...@@ -14,6 +14,7 @@ v 7.14.0 (unreleased) ...@@ -14,6 +14,7 @@ v 7.14.0 (unreleased)
v 7.13.1 v 7.13.1
- Revert issue caching - Revert issue caching
- Reverted cache for events
v 7.13.0 (unreleased) v 7.13.0 (unreleased)
- Remove repository graph log to fix slow cache updates after push event (Stan Hu) - Remove repository graph log to fix slow cache updates after push event (Stan Hu)
......
...@@ -8,11 +8,10 @@ ...@@ -8,11 +8,10 @@
= image_tag avatar_icon(event.author_email, 24), class: "avatar s24", alt:'' = image_tag avatar_icon(event.author_email, 24), class: "avatar s24", alt:''
= render "events/event/created_project", event: event = render "events/event/created_project", event: event
- else - else
= cache event do = image_tag avatar_icon(event.author_email, 24), class: "avatar s24", alt:''
= image_tag avatar_icon(event.author_email, 24), class: "avatar s24", alt:'' - if event.push?
- if event.push? = render "events/event/push", event: event
= render "events/event/push", event: event - elsif event.commented?
- elsif event.commented? = render "events/event/note", event: event
= render "events/event/note", event: event - else
- else = render "events/event/common", event: event
= render "events/event/common", event: event
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment