Merge remote-tracking branch 'origin/master' into merge-upstream

 Conflicts:
	app/javascript/styles/mastodon/components.scss
	app/javascript/styles/mastodon/modal.scss

1 files changed, 6 insertions, 0 deletions

diff --git a/spec/controllers/concerns/user_tracking_concern_spec.rb b/spec/controllers/concerns/user_tracking_concern_spec.rb
index d08095ef8..1e5620221 100644
--- a/spec/controllers/concerns/user_tracking_concern_spec.rb
+++ b/spec/controllers/concerns/user_tracking_concern_spec.rb
@@ -69,6 +69,12 @@ describe ApplicationController, type: :controller do
         expect(RegenerationWorker).to have_received(:perform_async)
       end
 
+      it 'sets the regeneration marker to expire' do
+        allow(RegenerationWorker).to receive(:perform_async)
+        get :show
+        expect(Redis.current.ttl("account:#{user.account_id}:regeneration")).to be >= 0
+      end
+
       it 'regenerates feed when sign in is older than two weeks' do
         get :show