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

2020-02-06 21:36:38 +01:00
parent ccaefd139d aeb6efbb03
commit 1a54b9b99e
156 changed files with 1830 additions and 544 deletions
--- a/app/helpers/accounts_helper.rb
+++ b/app/helpers/accounts_helper.rb
@@ -11,7 +11,7 @@ module AccountsHelper

  def acct(account)
    if account.local?
-      "@#{account.acct}@#{Rails.configuration.x.local_domain}"
+      "@#{account.acct}@#{site_hostname}"
    else
      "@#{account.pretty_acct}"
    end