In the case when a user can and has authenticated with ldap, however

ldap is disabled in the gitlab config, this fixes the API still calling the ldap backend.

In the case when a user can and has authenticated with ldap, however
e2e900a3 · Jurnell Cockhren · b75777fd · e2e900a3
Commit e2e900a3 authored Jan 28, 2014 by Jurnell Cockhren
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

internal.rb lib/api/internal.rb +3 -1

No files found.
--- 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