diff options
| author | ThibG <thib@sitedethib.com> | 2020-02-06 22:48:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-06 22:48:26 +0100 |
| commit | 96ec90b986c8a2783135f123c10062725d274733 (patch) | |
| tree | 1cbb8b756a2e4d0770c19b834ede0326f99a3dcc /app/helpers | |
| parent | ccaefd139d33f2f0bf4d097131bcf91960bee956 (diff) | |
| parent | fe9a124f5a9f3a7cb6cfba141245cccb88c7dfbe (diff) | |
Merge pull request #1278 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/accounts_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/accounts_helper.rb b/app/helpers/accounts_helper.rb index c9e95d8d8..e977db2c6 100644 --- 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 |