Merge remote-tracking branch 'origin/master' into gs-master

2018-03-27 10:44:12 -05:00
parent 49c957bc3b 3523aa440b
commit d2cdc2b5a3
18 changed files with 261 additions and 111 deletions
--- a/app/validators/unique_username_validator.rb
+++ b/app/validators/unique_username_validator.rb
@@ -6,7 +6,7 @@ class UniqueUsernameValidator < ActiveModel::Validator

    normalized_username = account.username.downcase.delete('.')

-    scope = Account.where(domain: nil, username: normalized_username)
+    scope = Account.where(domain: nil).where('lower(username) = ?', normalized_username)
    scope = scope.where.not(id: account.id) if account.persisted?

    account.errors.add(:username, :taken) if scope.exists?