Merge branch 'bw-todo-count-expiration' into 'master'

Todo count calculations now expired quicker for top bar stats

See merge request gitlab-org/gitlab-ce!15794

1 files changed, 2 insertions, 2 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index af1c36d9c93..093ff808626 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1054,13 +1054,13 @@ class User < ActiveRecord::Base
   end
 
   def todos_done_count(force: false)
-    Rails.cache.fetch(['users', id, 'todos_done_count'], force: force) do
+    Rails.cache.fetch(['users', id, 'todos_done_count'], force: force, expires_in: 20.minutes) do
       TodosFinder.new(self, state: :done).execute.count
     end
   end
 
   def todos_pending_count(force: false)
-    Rails.cache.fetch(['users', id, 'todos_pending_count'], force: force) do
+    Rails.cache.fetch(['users', id, 'todos_pending_count'], force: force, expires_in: 20.minutes) do
       TodosFinder.new(self, state: :pending).execute.count
     end
   end