Skip email confirmation when set by admin or via LDAP.

CHANGELOG

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

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