summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVeselin Todorov <veselin@veselin.bg>2012-01-11 17:21:15 +0200
committerVeselin Todorov <veselin@veselin.bg>2012-01-11 17:21:15 +0200
commit22e7f8ffccb91b9d6565f02dfe8c9ef8e6447b3a (patch)
treec9ba8f314a9b82930e090960c926a630f9b24e7e
parent3c9d7b7077f41ab354dd36c42bdd74345993159a (diff)
downloadgitlab-ce-22e7f8ffccb91b9d6565f02dfe8c9ef8e6447b3a.tar.gz
Fixing an issue in users#update when password is not present.
-rw-r--r--app/controllers/admin/users_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 033332a78e3..85a95de5a17 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -38,7 +38,7 @@ class Admin::UsersController < ApplicationController
def update
admin = params[:user].delete("admin")
- if params[:user][:password].empty?
+ if params[:user][:password].blank?
params[:user].delete(:password)
params[:user].delete(:password_confirmation)
end