diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-16 18:07:53 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-16 18:07:53 +0300 |
| commit | c1f98d9590def61ad2fca09cc06a7a9d52cdebc5 (patch) | |
| tree | 84490eecee06513f152cd466ed7c1d23a71a6ddf /lib/gitlab/auth | |
| parent | 12166c0faf75479889bc0ac432b85b9dae91552b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/auth')
| -rw-r--r-- | lib/gitlab/auth/auth_finders.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/auth/auth_finders.rb b/lib/gitlab/auth/auth_finders.rb index edcde55974c..c69462b12de 100644 --- a/lib/gitlab/auth/auth_finders.rb +++ b/lib/gitlab/auth/auth_finders.rb @@ -148,7 +148,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? + return unless Gitlab::ExternalAuthorization.allow_deploy_tokens_and_deploy_keys? token = current_request.env[DEPLOY_TOKEN_HEADER].presence || parsed_oauth_token |