about summary refs log tree commit diff
path: root/app/models/concerns
diff options
context:
space:
mode:
authorStarfall <root@starfall.blue>2020-05-10 02:59:07 -0500
committerStarfall <root@starfall.blue>2020-05-10 02:59:07 -0500
commit77fa1183cc113e3d3d20140e3545443cf6c7f170 (patch)
tree2ce4e4dd5235999d163350779f18cf74fe1ff0d1 /app/models/concerns
parentb107e4f771f036b214563764fcd95786f8016ee7 (diff)
parentc6ff4c634caf718adf7280e04909c091d15add1d (diff)
Merge branch 'glitch'
Diffstat (limited to 'app/models/concerns')
-rw-r--r--app/models/concerns/omniauthable.rb2
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