tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
- config/locales/pl.yml
  Conflict caused by new upstream string too close to glitch-specific
  “flavour” string. Took both strings.
This commit is contained in:
Thibaut Girka
2019-04-08 15:57:56 +02:00
parent 30500dff7c 3f036ac6b8
commit f5f6d23d55
80 changed files with 785 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/concerns/account_finder_concern.rb
View File

@@ -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)