Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream

2023-09-02 11:41:40 +02:00
parent 786e586686 072112867b
commit 6b7c47311d
34 changed files with 686 additions and 137 deletions
@@ -82,6 +82,7 @@ class Account < ApplicationRecord
  include DomainMaterializable
  include AccountMerging
  include AccountSearch
+  include AccountStatusesSearch

  MAX_DISPLAY_NAME_LENGTH = (ENV['MAX_DISPLAY_NAME_CHARS'] || 30).to_i
  MAX_NOTE_LENGTH = (ENV['MAX_BIO_CHARS'] || 500).to_i