From 944d9eeec0d0bcba66b59b0ba98ec12ae1de6362 Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Fri, 10 Oct 2014 09:06:00 +0200
Subject: [PATCH] Do AD check if AD is enabled.

---
 lib/gitlab/ldap/group.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/gitlab/ldap/group.rb b/lib/gitlab/ldap/group.rb
index 400ee1bf9e..80bcd2edbc 100644
--- a/lib/gitlab/ldap/group.rb
+++ b/lib/gitlab/ldap/group.rb
@@ -38,7 +38,9 @@ module Gitlab
         elsif member_dns.include?(user.dn)
           true
         else
-          adapter.dn_matches_filter?(user.dn, active_directory_recursive_memberof_filter)
+          if Gitlab.config.ldap.active_directory
+            adapter.dn_matches_filter?(user.dn, active_directory_recursive_memberof_filter)
+          end
         end
       end