Commit 9d2840fb authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'skip_ad_check' into 'master'

Skip ad check

Fixes #181

See merge request !193
parents 37169e54 51f9f480
...@@ -37,7 +37,7 @@ module Gitlab ...@@ -37,7 +37,7 @@ module Gitlab
member_uids.include?(user.uid) member_uids.include?(user.uid)
elsif member_dns.include?(user.dn) elsif member_dns.include?(user.dn)
true true
else elsif Gitlab.config.ldap.active_directory
adapter.dn_matches_filter?(user.dn, active_directory_recursive_memberof_filter) adapter.dn_matches_filter?(user.dn, active_directory_recursive_memberof_filter)
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment