Skip to content
Snippets Groups Projects
Commit 9d2840fb authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Merge branch 'skip_ad_check' into 'master'

Skip ad check

Fixes #181

See merge request !193
parents 37169e54 51f9f480
No related branches found
No related tags found
3 merge requests!8889WIP: Port of 25624-anticipate-obstacles-to-removing-turbolinks to EE.,!7795Asciidoctor plantuml,!7793Add support for PlantUML diagrams in Asciidoc.
Loading
Loading
@@ -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
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment