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
the existence of former ldap users doesn't imply LDAP is enabled.
Dmitriy Zaporozhets
2 parents 81360488 e2e900a3
Showing 1 changed file with 3 additions and 1 deletions Show diff stats
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
...	...	@@ -35,7 +35,9 @@ module API
35	35	user = key.user
36	36
37	37	return false if user.blocked?
38		- return false if user.ldap_user? && Gitlab::LDAP::User.blocked?(user.extern_uid)
	38	+ if Gitlab.config.ldap.enabled
	39	+ return false if user.ldap_user? && Gitlab::LDAP::User.blocked?(user.extern_uid)
	40	+ end
39	41
40	42	action = case git_cmd
41	43	when *DOWNLOAD_COMMANDS
...	...