Merge branch 'skip-email-reconfirmation' into 'master'
Skip email confirmation when set by admin or via LDAP. Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2203. See merge request !494
This commit is contained in:
commit
6e88d9335b
3 changed files with 3 additions and 1 deletions
|
@ -79,6 +79,7 @@ v 7.9.3
|
|||
- Add icons to Add dropdown items.
|
||||
- Allow admin to create public deploy keys that are accessible to any project.
|
||||
- Warn when gitlab-shell version doesn't match requirement.
|
||||
- Skip email confirmation when set by admin or via LDAP.
|
||||
|
||||
|
||||
v 7.9.2
|
||||
|
|
|
@ -72,8 +72,8 @@ class Admin::UsersController < Admin::ApplicationController
|
|||
end
|
||||
|
||||
respond_to do |format|
|
||||
user.skip_reconfirmation!
|
||||
if user.update_attributes(user_params_with_pass)
|
||||
user.confirm!
|
||||
format.html { redirect_to [:admin, user], notice: 'User was successfully updated.' }
|
||||
format.json { head :ok }
|
||||
else
|
||||
|
|
|
@ -39,6 +39,7 @@ module Gitlab
|
|||
end
|
||||
|
||||
def update_user_attributes
|
||||
gl_user.skip_reconfirmation!
|
||||
gl_user.email = auth_hash.email
|
||||
|
||||
# Build new identity only if we dont have have same one
|
||||
|
|
Loading…
Reference in a new issue