diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-07-15 13:25:11 +0200 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-07-15 13:25:11 +0200 |
| commit | 56398ea1611b4bf1b3e27cc057ffb049e78e5173 (patch) | |
| tree | a43e14e102c8a1bf3e7a86ac97fc9b6fb2bf2170 /app/controllers/admin | |
| parent | 275a5281d5f35bf2243a0b5814b8fb83f1561105 (diff) | |
| download | gitlab-ce-56398ea1611b4bf1b3e27cc057ffb049e78e5173.tar.gz | |
Do not sent a generated password via email for admin created user.
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/users_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 44c93471df4..1432fff8821 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -45,6 +45,7 @@ class Admin::UsersController < Admin::ApplicationController @user = User.new(user_params.merge(opts)) @user.created_by_id = current_user.id @user.generate_password + @user.generate_reset_token @user.skip_confirmation! respond_to do |format| |