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

CHANGELOG

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

app/controllers/admin/users_controller.rb

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

lib/gitlab/ldap/user.rb

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