Do AD check if AD is enabled.

944d9eee · Marin Jankovski · 37169e54 · 944d9eee
Commit 944d9eee authored Oct 10, 2014 by Marin Jankovski
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

lib/gitlab/ldap/group.rb lib/gitlab/ldap/group.rb +3 -1

No files found.
--- 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