diff options
| author | dosire <sytses@gmail.com> | 2014-02-21 15:36:53 +0100 |
|---|---|---|
| committer | dosire <sytses@gmail.com> | 2014-02-21 15:36:53 +0100 |
| commit | 403298317f0035be27a812dae9c5090a51c11faa (patch) | |
| tree | 9ea82a9ffb93d6f8d10cf37b8f1c04da5b4c6726 /lib/api/internal.rb | |
| parent | 77dc5de9233db897f7eaf50f4fd0f230b17b555d (diff) | |
| parent | bbd92f554d22911afca9fca67077c73e8826bf23 (diff) | |
| download | gitlab-ce-403298317f0035be27a812dae9c5090a51c11faa.tar.gz | |
Merge branch 'master' into styleguide
Conflicts:
CONTRIBUTING.md
Diffstat (limited to 'lib/api/internal.rb')
| -rw-r--r-- | lib/api/internal.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/api/internal.rb b/lib/api/internal.rb index ed6b50c3a6a..ebc9fef07b4 100644 --- a/lib/api/internal.rb +++ b/lib/api/internal.rb @@ -35,7 +35,9 @@ module API user = key.user return false if user.blocked? - return false if user.ldap_user? && Gitlab::LDAP::User.blocked?(user.extern_uid) + if Gitlab.config.ldap.enabled + return false if user.ldap_user? && Gitlab::LDAP::User.blocked?(user.extern_uid) + end action = case git_cmd when *DOWNLOAD_COMMANDS |