diff options
| author | ThibG <thib@sitedethib.com> | 2020-05-03 23:29:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-03 23:29:41 +0200 |
| commit | 75b0fa8b760b8829b933b249ac48965abdab15ae (patch) | |
| tree | 4b2e5293f15972012c4dc876bb66870d692490d0 /app/models/concerns/omniauthable.rb | |
| parent | 9c61dadc0db7009853c6b2345a02c3b219022929 (diff) | |
| parent | 89fcd68b7501f81a3e33f6b1abff6fc66f78e04b (diff) | |
Merge pull request #1324 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/concerns/omniauthable.rb')
| -rw-r--r-- | app/models/concerns/omniauthable.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/omniauthable.rb b/app/models/concerns/omniauthable.rb index 960784222..736da6c1d 100644 --- a/app/models/concerns/omniauthable.rb +++ b/app/models/concerns/omniauthable.rb @@ -82,7 +82,7 @@ module Omniauthable username = starting_username i = 0 - while Account.exists?(username: username) + while Account.exists?(username: username, domain: nil) i += 1 username = "#{starting_username}_#{i}" end |