Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-12-01 03:07:13 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-12-01 03:07:13 +0300
commitba557e8fea7c8a825a702ab154fa1574c4d2998a (patch)
tree9c252889816492ea0ebc5c7f86b1f5cd4a2f3620 /lib/gitlab/api_authentication
parentd88cacce3f205151867ab3f9297f10cdae4a7025 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/api_authentication')
-rw-r--r--lib/gitlab/api_authentication/token_resolver.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/api_authentication/token_resolver.rb b/lib/gitlab/api_authentication/token_resolver.rb
index dd9039e37f6..afada055928 100644
--- a/lib/gitlab/api_authentication/token_resolver.rb
+++ b/lib/gitlab/api_authentication/token_resolver.rb
@@ -165,6 +165,8 @@ module Gitlab
end
def with_deploy_token(raw, &block)
+ raise ::Gitlab::Auth::UnauthorizedError if Gitlab::ExternalAuthorization.enabled?
+
token = ::DeployToken.active.find_by_token(raw.password)
return unless token