diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-04-08 15:57:56 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-04-08 15:57:56 +0200 |
| commit | f5f6d23d554b3a81020feebc65188cc64f644095 (patch) | |
| tree | b30197858c2018a32be559f5b4b479571c75dee3 /app/models/concerns | |
| parent | 30500dff7cbf27fbee6eb45e20cc24ca0b7a9e77 (diff) | |
| parent | 3f036ac6b8f9919b3b141012db163476f18fe299 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.
Diffstat (limited to 'app/models/concerns')
| -rw-r--r-- | app/models/concerns/account_finder_concern.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/account_finder_concern.rb b/app/models/concerns/account_finder_concern.rb index 7e3bbde09..0ac49cc12 100644 --- a/app/models/concerns/account_finder_concern.rb +++ b/app/models/concerns/account_finder_concern.rb @@ -13,7 +13,7 @@ module AccountFinderConcern end def representative - find_local(Setting.site_contact_username.gsub(/\A@/, '')) || Account.local.find_by(suspended: false) + find_local(Setting.site_contact_username.strip.gsub(/\A@/, '')) || Account.local.find_by(suspended: false) end def find_local(username) |