From 125cb9b866b66a4ae21a3fec8ae5ad6e1b3ae4ec Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 12 May 2015 11:21:56 +0200
Subject: Don't accidentally unblock auto created users from Active Directory.

---
 lib/gitlab/ldap/access.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/gitlab/ldap/access.rb b/lib/gitlab/ldap/access.rb
index 960fb3849b4..16ff03c38d4 100644
--- a/lib/gitlab/ldap/access.rb
+++ b/lib/gitlab/ldap/access.rb
@@ -40,7 +40,7 @@ module Gitlab
             user.block unless user.blocked?
             false
           else
-            user.activate if user.blocked?
+            user.activate if user.blocked? && !ldap_config.block_auto_created_users
             true
           end
         else
-- 
cgit v1.2.1