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/git_access.rb | |
| parent | d88cacce3f205151867ab3f9297f10cdae4a7025 (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 9a3f5fb844b..da2a81983ec 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) + actor.is_a?(DeployKey) && !Gitlab::ExternalAuthorization.enabled? end def deploy_token @@ -375,7 +375,7 @@ module Gitlab end def deploy_token? - actor.is_a?(DeployToken) + actor.is_a?(DeployToken) && !Gitlab::ExternalAuthorization.enabled? end def ci? |