Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

CHANGELOG

@@ -78,6 +78,8 @@ v 7.9.3
   - Contains no changes
   - 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

config/initializers/5_backend.rb

@@ -6,3 +6,10 @@ require Rails.root.join("lib", "gitlab", "backend", "shell")
 
 # GitLab shell adapter
 require Rails.root.join("lib", "gitlab", "backend", "shell_adapter")
+
+required_version = Gitlab::VersionInfo.parse(Gitlab::Shell.version_required)
+current_version = Gitlab::VersionInfo.parse(Gitlab::Shell.new.version)
+
+unless current_version.valid? && required_version <= current_version
+  warn "WARNING: This version of GitLab depends on gitlab-shell #{required_version}, but you're running #{current_version}. Please update gitlab-shell."
+end

lib/gitlab/backend/shell.rb

@@ -240,7 +240,7 @@ module Gitlab
       gitlab_shell_version_file = "#{gitlab_shell_path}/VERSION"
 
       if File.readable?(gitlab_shell_version_file)
-        File.read(gitlab_shell_version_file)
+        File.read(gitlab_shell_version_file).chomp
       end
     end
 

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