diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-01 03:07:13 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-01 03:07:13 +0300 |
| commit | ba557e8fea7c8a825a702ab154fa1574c4d2998a (patch) | |
| tree | 9c252889816492ea0ebc5c7f86b1f5cd4a2f3620 /lib/gitlab/auth | |
| parent | d88cacce3f205151867ab3f9297f10cdae4a7025 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/auth')
| -rw-r--r-- | lib/gitlab/auth/auth_finders.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/auth/auth_finders.rb b/lib/gitlab/auth/auth_finders.rb index c994f179b66..16bee187c87 100644 --- a/lib/gitlab/auth/auth_finders.rb +++ b/lib/gitlab/auth/auth_finders.rb @@ -147,6 +147,7 @@ module Gitlab # deploy tokens are accepted with deploy token headers and basic auth headers def deploy_token_from_request return unless route_authentication_setting[:deploy_token_allowed] + return if Gitlab::ExternalAuthorization.enabled? token = current_request.env[DEPLOY_TOKEN_HEADER].presence || parsed_oauth_token |