Merge branch 'fix_counter_cache_invalidation' into 'master'

Fix counter cache invalidation

Closes #32854 and #32870

See merge request !11736

1 files changed, 2 insertions, 2 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index 9b0c1ebd7c5..625ba90002b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -919,13 +919,13 @@ class User < ActiveRecord::Base
   end
 
   def assigned_open_merge_requests_count(force: false)
-    Rails.cache.fetch(['users', id, 'assigned_open_merge_requests_count'], force: force) do
+    Rails.cache.fetch(['users', id, 'assigned_open_merge_requests_count'], force: force, expires_in: 20.minutes) do
       MergeRequestsFinder.new(self, assignee_id: self.id, state: 'opened').execute.count
     end
   end
 
   def assigned_open_issues_count(force: false)
-    Rails.cache.fetch(['users', id, 'assigned_open_issues_count'], force: force) do
+    Rails.cache.fetch(['users', id, 'assigned_open_issues_count'], force: force, expires_in: 20.minutes) do
       IssuesFinder.new(self, assignee_id: self.id, state: 'opened').execute.count
     end
   end