diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-24 11:46:39 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-24 11:46:39 -0700 |
| commit | 3c11359910892daefc68d698fe28cf0862683fde (patch) | |
| tree | 3a796365251433c0e35fd0074f63baf0dd6ca165 | |
| parent | 7d8998cf38ba9bc9ec72853356cf94f675bfaac5 (diff) | |
| parent | 0f3ef9bed2fa631d1e3a7a9f52b3ebc0557eff38 (diff) | |
| download | gitlab-ce-3c11359910892daefc68d698fe28cf0862683fde.tar.gz | |
Merge pull request #5436 from Seed-Of-Hate/master
Fix for issue #5431
| -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 dccbfa2f709..c9875b96321 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -47,6 +47,7 @@ class Admin::UsersController < Admin::ApplicationController @user = User.build_user(params[:user].merge(opts), as: :admin) @user.admin = (admin && admin.to_i > 0) @user.created_by_id = current_user.id + @user.generate_password @user.confirm! respond_to do |format| |