diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-11-28 03:34:12 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-11-28 03:34:12 +0000 |
| commit | d8f75233686fe20bff26599704fbcb235f7bb43b (patch) | |
| tree | 15a38c9b174b279bac9f917c991e29b0967b9622 /app/controllers | |
| parent | eff2404785f58241f947bd7388564f49119d517d (diff) | |
| parent | 0ba03d7eb1d80e019b9b8266f0e14356d32e7d69 (diff) | |
| download | gitlab-ce-d8f75233686fe20bff26599704fbcb235f7bb43b.tar.gz | |
Merge branch 'events-cache-invalidation' into 'master'
Remove caching of events data
This MR removes the caching of events data as this was deemed unnecessary while increasing load on the database. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6578#note_18864037 and 5371da341e9d7768ebab8e159b3e2cc8fad1d827 for more information.
See merge request !6578
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/profiles/avatars_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/projects/avatars_controller.rb | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/app/controllers/profiles/avatars_controller.rb b/app/controllers/profiles/avatars_controller.rb index f193adb46b4..daa51ae41df 100644 --- a/app/controllers/profiles/avatars_controller.rb +++ b/app/controllers/profiles/avatars_controller.rb @@ -4,7 +4,6 @@ class Profiles::AvatarsController < Profiles::ApplicationController @user.remove_avatar! @user.save - @user.reset_events_cache redirect_to profile_path end diff --git a/app/controllers/projects/avatars_controller.rb b/app/controllers/projects/avatars_controller.rb index ada7db3c552..53788687076 100644 --- a/app/controllers/projects/avatars_controller.rb +++ b/app/controllers/projects/avatars_controller.rb @@ -20,7 +20,6 @@ class Projects::AvatarsController < Projects::ApplicationController @project.remove_avatar! @project.save - @project.reset_events_cache redirect_to edit_project_path(@project) end |