diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-02-15 13:30:56 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-02-15 13:30:56 +0000 |
| commit | 98e4d4083a7d734b7f60402041aa59fa66309cac (patch) | |
| tree | 261ab0ad474dd85715221bdbe84b8929c82609cb /app | |
| parent | ba0d45c439ae33f15254158069f5434988402d18 (diff) | |
| parent | eddf4c0f6cb6125a30cbc2528a468d2c3d5a48e0 (diff) | |
| download | gitlab-ce-98e4d4083a7d734b7f60402041aa59fa66309cac.tar.gz | |
Merge branch 'change/strip-whitespace-from-username-input#42637' into 'master'
Trim whitespace from input in the username/email form field
Closes #42637
See merge request gitlab-org/gitlab-ce!17020
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 4097fe2b5dc..5e84d2da805 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -249,7 +249,7 @@ class User < ActiveRecord::Base def find_for_database_authentication(warden_conditions) conditions = warden_conditions.dup if login = conditions.delete(:login) - where(conditions).find_by("lower(username) = :value OR lower(email) = :value", value: login.downcase) + where(conditions).find_by("lower(username) = :value OR lower(email) = :value", value: login.downcase.strip) else find_by(conditions) end |