Skip email confirmation when set by admin or via LDAP.

This commit is contained in:
Douwe Maan 2015-04-06 13:26:41 +02:00
parent 45ca39e81b
commit f2af30f195
3 changed files with 3 additions and 1 deletions

View file

@ -62,6 +62,7 @@ v 7.10.0 (unreleased)
- Project labels are now available over the API under the "tag_list" field (Cristian Medina)
- Fixed link paths for HTTP and SSH on the admin project view (Jeremy Maziarz)
- Fix and improve help rendering (Sullivan Sénéchal)
- Skip email confirmation when set by admin or via LDAP.
v 7.9.2

View file

@ -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

View file

@ -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