diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-06 09:13:49 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-04-06 09:13:49 +0000 |
commit | 20e9b32c96a5b08e3f61c8974b43977f98d8666e (patch) | |
tree | 8d2e0e895c7012088eaa62015a311aee2ab93d39 /app | |
parent | 6cad73439b3850e2ed7e5f09357cff43f73e47fb (diff) | |
parent | b099c6ff9fcbd81beb75fd12bff8d1d5b9c16083 (diff) | |
download | gitlab-ce-20e9b32c96a5b08e3f61c8974b43977f98d8666e.tar.gz |
Merge branch 'ui-mr-counter-cache' into 'master'
Deleting a MR you are assigned to should decrements counter
Closes #44458
See merge request gitlab-org/gitlab-ce!17951
Diffstat (limited to 'app')
-rw-r--r-- | app/models/user.rb | 5 | ||||
-rw-r--r-- | app/services/issuable/destroy_service.rb | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 7b6857a0d34..ce56b39b1c8 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1046,11 +1046,6 @@ class User < ActiveRecord::Base end end - def update_cache_counts - assigned_open_merge_requests_count(force: true) - assigned_open_issues_count(force: true) - end - def update_todos_count_cache todos_done_count(force: true) todos_pending_count(force: true) diff --git a/app/services/issuable/destroy_service.rb b/app/services/issuable/destroy_service.rb index 7197a426a72..0b1a33518c6 100644 --- a/app/services/issuable/destroy_service.rb +++ b/app/services/issuable/destroy_service.rb @@ -4,6 +4,7 @@ module Issuable TodoService.new.destroy_target(issuable) do |issuable| if issuable.destroy issuable.update_project_counter_caches + issuable.assignees.each(&:invalidate_cache_counts) end end end |