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

2021-11-19 18:51:41 +01:00
parent f2b376e9d8 db32835338
commit 2b4c7beb73
28 changed files with 337 additions and 333 deletions
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -147,7 +147,7 @@ class Account < ApplicationRecord

  delegate :chosen_languages, to: :user, prefix: false, allow_nil: true

-  update_index('accounts#account', :self)
+  update_index('accounts', :self)

  def local?
    domain.nil?