Skip to content

G
gitlab-ce
Commit 3c113599 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files
Options

Merge pull request #5436 from Seed-Of-Hate/master 

Fix for issue #5431
parents 7d8998cf 0f3ef9be
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
app/controllers/admin/users_controller.rb
View file @ 3c113599
...@@ -47,6 +47,7 @@ class Admin::UsersController < Admin::ApplicationController ...@@ -47,6 +47,7 @@ class Admin::UsersController < Admin::ApplicationController
@user = User.build_user(params[:user].merge(opts), as: :admin) @user = User.build_user(params[:user].merge(opts), as: :admin)
@user.admin = (admin && admin.to_i > 0) @user.admin = (admin && admin.to_i > 0)
@user.created_by_id = current_user.id @user.created_by_id = current_user.id
@user.generate_password
@user.confirm! @user.confirm!
respond_to do |format| respond_to do |format|
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7