diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-26 10:20:36 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-26 10:20:36 +0200 |
| commit | 4cd7a56333138de7438b2b59788f8732222845d7 (patch) | |
| tree | b957e0f0b31fad1e49e2e987ff5527931f25326b /app/controllers/admin | |
| parent | a389d77769f941aac666df232f223692d0e95971 (diff) | |
| download | gitlab-ce-4cd7a56333138de7438b2b59788f8732222845d7.tar.gz | |
Add User#email uniq validation. Fixed confirmation for admin/users form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/users_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 426001e6213..2f981627137 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -47,7 +47,7 @@ class Admin::UsersController < Admin::ApplicationController @user.admin = (admin && admin.to_i > 0) @user.created_by_id = current_user.id @user.generate_password - @user.confirm! + @user.skip_confirmation! respond_to do |format| if @user.save |