Commit 944d9eee authored by Marin Jankovski's avatar Marin Jankovski

Do AD check if AD is enabled.

parent 37169e54
...@@ -38,9 +38,11 @@ module Gitlab ...@@ -38,9 +38,11 @@ module Gitlab
elsif member_dns.include?(user.dn) elsif member_dns.include?(user.dn)
true true
else else
if 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
end
def member_dns def member_dns
if entry.respond_to? :member if entry.respond_to? :member
......
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