diff options
Diffstat (limited to 'lib/gitlab/api_authentication/token_resolver.rb')
-rw-r--r-- | lib/gitlab/api_authentication/token_resolver.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/api_authentication/token_resolver.rb b/lib/gitlab/api_authentication/token_resolver.rb index afada055928..3f8025c408a 100644 --- a/lib/gitlab/api_authentication/token_resolver.rb +++ b/lib/gitlab/api_authentication/token_resolver.rb @@ -165,7 +165,9 @@ module Gitlab end def with_deploy_token(raw, &block) - raise ::Gitlab::Auth::UnauthorizedError if Gitlab::ExternalAuthorization.enabled? + unless Gitlab::ExternalAuthorization.allow_deploy_tokens_and_deploy_keys? + raise ::Gitlab::Auth::UnauthorizedError + end token = ::DeployToken.active.find_by_token(raw.password) return unless token |