Merge branch 'skip_ad_check' into 'master'

Skip ad check Fixes #181 See merge request !193
2026-08-27 05:26:05 +10:00 · 2014-10-14 09:02:39 +00:00
parent 37169e5408 51f9f4807b
commit 9d2840fba2
1 changed files with 1 additions and 1 deletions
@@ -37,7 +37,7 @@ module Gitlab
          member_uids.include?(user.uid)
        elsif member_dns.include?(user.dn)
          true
-        else
+        elsif Gitlab.config.ldap.active_directory
          adapter.dn_matches_filter?(user.dn, active_directory_recursive_memberof_filter)
        end
      end