diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-05-26 19:13:00 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-05-26 19:13:00 +0300 |
commit | 70714f57ebe4ac1370eba38af1ca534708f90433 (patch) | |
tree | 20c6da074906954319c473ff579e484b9ca2eb48 /app/models | |
parent | 239e08e6997e10c2c84c5105fe3bccb55b98d8fc (diff) | |
parent | 33687db01d399b6b1e6b6a120995d84f833baac4 (diff) |
Merge branch 'fix_counter_cache_invalidation' into 'master'
Fix counter cache invalidation
Closes #32854 and #32870
See merge request !11736
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/user.rb | 4 |
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 |