diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-04-05 16:49:18 +0300 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-04-07 05:20:16 +0300 |
| commit | 72220a99d1cdbcf8a914f9e765c43e63eaee2548 (patch) | |
| tree | 314df7454174092bee8f1ea83d6bda53d760959e /lib/gitlab/git_access.rb | |
| parent | 171b2625b128e5954ce0a150a4fc923a22164e4e (diff) | |
Support Deploy Tokens properly without hacking abilities
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 e3c723ab274..0d1ee73ca1a 100644 --- a/lib/gitlab/git_access.rb +++ b/lib/gitlab/git_access.rb @@ -290,10 +290,10 @@ module Gitlab def can_read_project? if deploy_key? deploy_key.has_access_to?(project) + elsif deploy_token? + deploy_token.has_access_to?(project) elsif user user.can?(:read_project, project) - elsif deploy_token? - deploy_token.active? && deploy_token.project == project elsif ci? true # allow CI (build without a user) for backwards compatibility end || Guest.can?(:read_project, project) |