Merge pull request #6189 from jcockhren/api_ldap_check_for_user

the existence of former ldap users doesn't imply LDAP is enabled.

Merge pull request #6189 from jcockhren/api_ldap_check_for_user
0744eac9 · Dmitriy Zaporozhets · 81360488 · e2e900a3 · 0744eac9
Commit 0744eac9 authored Feb 17, 2014 by Dmitriy Zaporozhets
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