From 944d9eeec0d0bcba66b59b0ba98ec12ae1de6362 Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Fri, 10 Oct 2014 09:06:00 +0200 Subject: [PATCH 1/2] Do AD check if AD is enabled. --- lib/gitlab/ldap/group.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/gitlab/ldap/group.rb b/lib/gitlab/ldap/group.rb index 400ee1bf9e..80bcd2edbc 100644 --- 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 From 51f9f4807b7a43f09d65d06ea69b44347e4c05ab Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Tue, 14 Oct 2014 08:24:48 +0200 Subject: [PATCH 2/2] Remove unecessary nesting. --- lib/gitlab/ldap/group.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/gitlab/ldap/group.rb b/lib/gitlab/ldap/group.rb index 80bcd2edbc..8adf3c7aae 100644 --- a/lib/gitlab/ldap/group.rb +++ b/lib/gitlab/ldap/group.rb @@ -37,10 +37,8 @@ module Gitlab member_uids.include?(user.uid) elsif member_dns.include?(user.dn) true - else - if Gitlab.config.ldap.active_directory - adapter.dn_matches_filter?(user.dn, active_directory_recursive_memberof_filter) - end + elsif Gitlab.config.ldap.active_directory + adapter.dn_matches_filter?(user.dn, active_directory_recursive_memberof_filter) end end