Skip to content
Snippets Groups Projects

6 2 stable

Closed gitlab-qa-bot requested to merge 6-2-stable into master
1 file
+ 1
0
Compare changes
  • Side-by-side
  • Inline
@@ -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|
Loading