summaryrefslogtreecommitdiff
path: root/app/services/notes
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-11-28 03:34:12 +0000
committerDouwe Maan <douwe@gitlab.com>2016-11-28 03:34:12 +0000
commitd8f75233686fe20bff26599704fbcb235f7bb43b (patch)
tree15a38c9b174b279bac9f917c991e29b0967b9622 /app/services/notes
parenteff2404785f58241f947bd7388564f49119d517d (diff)
parent0ba03d7eb1d80e019b9b8266f0e14356d32e7d69 (diff)
downloadgitlab-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/services/notes')
-rw-r--r--app/services/notes/delete_service.rb1
-rw-r--r--app/services/notes/update_service.rb1
2 files changed, 0 insertions, 2 deletions
diff --git a/app/services/notes/delete_service.rb b/app/services/notes/delete_service.rb
index 7f1b30ec84e..a673e8e9dde 100644
--- a/app/services/notes/delete_service.rb
+++ b/app/services/notes/delete_service.rb
@@ -2,7 +2,6 @@ module Notes
class DeleteService < BaseService
def execute(note)
note.destroy
- note.reset_events_cache
end
end
end
diff --git a/app/services/notes/update_service.rb b/app/services/notes/update_service.rb
index 1361b1e0300..75a4b3ed826 100644
--- a/app/services/notes/update_service.rb
+++ b/app/services/notes/update_service.rb
@@ -5,7 +5,6 @@ module Notes
note.update_attributes(params.merge(updated_by: current_user))
note.create_new_cross_references!(current_user)
- note.reset_events_cache
if note.previous_changes.include?('note')
TodoService.new.update_note(note, current_user)