diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2014-09-30 12:07:31 +0200 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2014-09-30 12:07:31 +0200 |
| commit | f7aba277e7971668172196da74f946e5a48aabc3 (patch) | |
| tree | 85e122e4e562360b759c21f006a060e21d350f0f /lib | |
| parent | 0c29cb3451414d21346894c140a17c53de6e1567 (diff) | |
| download | gitlab-ce-f7aba277e7971668172196da74f946e5a48aabc3.tar.gz | |
Add option to gitlab config to specify if LDAP server is active directory.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ldap/access.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/ldap/access.rb b/lib/gitlab/ldap/access.rb index c054b6f5865..d2235d2e3bc 100644 --- a/lib/gitlab/ldap/access.rb +++ b/lib/gitlab/ldap/access.rb @@ -28,7 +28,9 @@ module Gitlab def allowed?(user) if Gitlab::LDAP::Person.find_by_dn(user.extern_uid, adapter) - !Gitlab::LDAP::Person.disabled_via_active_directory?(user.extern_uid, adapter) + if Gitlab.config.ldap.active_directory + !Gitlab::LDAP::Person.disabled_via_active_directory?(user.extern_uid, adapter) + end else false end |