Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main

Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore.
2023-08-13 18:47:15 +02:00
parent 678fa1e6af 121443c0fc
commit 6530f9709c
194 changed files with 3931 additions and 2110 deletions
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -169,7 +169,7 @@ class Status < ApplicationRecord
  REAL_TIME_WINDOW = 6.hours

  def cache_key
-    "v2:#{super}"
+    "v3:#{super}"
  end

  def searchable_by(preloaded = nil)