Merge branch 'main' into glitch-soc/merge-upstream

2022-03-04 01:07:49 +01:00
parent 3637a0101e 2ea754b861
commit d9c3109bb6
24 changed files with 66 additions and 57 deletions
--- a/app/models/account_statuses_cleanup_policy.rb
+++ b/app/models/account_statuses_cleanup_policy.rb
@@ -23,6 +23,7 @@ class AccountStatusesCleanupPolicy < ApplicationRecord
  include Redisable

  ALLOWED_MIN_STATUS_AGE = [
+    1.week.seconds,
    2.weeks.seconds,
    1.month.seconds,
    2.months.seconds,