Skip to content
Snippets Groups Projects

Make getting a user by the username case insensitive

Merged William George requested to merge awgeorge1/gitlab-ce:master into master
All threads resolved!
Compare and Show latest version
2 files
+ 16
4
Compare changes
  • Side-by-side
  • Inline
Files
2
+ 4
4
@@ -164,11 +164,11 @@ def reorder_users(users)
@@ -164,11 +164,11 @@ def reorder_users(users)
present user, with: Entities::UserPublic, current_user: current_user
present user, with: Entities::UserPublic, current_user: current_user
else
else
conflict!('Email has already been taken') if User
conflict!('Email has already been taken') if User
.where(email: user.email)
.iwhere(email: user.email)
.count > 0
.count > 0
conflict!('Username has already been taken') if User
conflict!('Username has already been taken') if User
.where(username: user.username)
.iwhere(username: user.username)
.count > 0
.count > 0
render_validation_error!(user)
render_validation_error!(user)
@@ -196,11 +196,11 @@ def reorder_users(users)
@@ -196,11 +196,11 @@ def reorder_users(users)
not_found!('User') unless user
not_found!('User') unless user
conflict!('Email has already been taken') if params[:email] &&
conflict!('Email has already been taken') if params[:email] &&
User.where(email: params[:email])
User.iwhere(email: params[:email])
.where.not(id: user.id).count > 0
.where.not(id: user.id).count > 0
conflict!('Username has already been taken') if params[:username] &&
conflict!('Username has already been taken') if params[:username] &&
User.where(username: params[:username])
User.iwhere(username: params[:username])
.where.not(id: user.id).count > 0
.where.not(id: user.id).count > 0
user_params = declared_params(include_missing: false)
user_params = declared_params(include_missing: false)
Loading