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/git_access.rb | |
parent | 12166c0faf75479889bc0ac432b85b9dae91552b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/git_access.rb')
-rw-r--r-- | lib/gitlab/git_access.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/git_access.rb b/lib/gitlab/git_access.rb index 35b330fa089..9d19695363a 100644 --- a/lib/gitlab/git_access.rb +++ b/lib/gitlab/git_access.rb @@ -367,7 +367,7 @@ module Gitlab end def deploy_key? - actor.is_a?(DeployKey) && !Gitlab::ExternalAuthorization.enabled? + actor.is_a?(DeployKey) && Gitlab::ExternalAuthorization.allow_deploy_tokens_and_deploy_keys? end def deploy_token @@ -375,7 +375,7 @@ module Gitlab end def deploy_token? - actor.is_a?(DeployToken) && !Gitlab::ExternalAuthorization.enabled? + actor.is_a?(DeployToken) && Gitlab::ExternalAuthorization.allow_deploy_tokens_and_deploy_keys? end def ci? |