diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-11-16 20:31:08 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-11-16 20:31:23 +0800 |
| commit | a9765fb47fbbd1e1070434fc06cc76b25a42caa6 (patch) | |
| tree | 30ffc7e93c5721c6ac7743daf6f705a4566efa98 /lib | |
| parent | 721478123068c6718ec73c72a7b7d32c00c816df (diff) | |
| download | gitlab-ce-a9765fb47fbbd1e1070434fc06cc76b25a42caa6.tar.gz | |
Introduce has_access_to? so that we could reuse it
Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7383#note_18439108
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/auth/result.rb | 3 | ||||
| -rw-r--r-- | lib/gitlab/git_access.rb | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/gitlab/auth/result.rb b/lib/gitlab/auth/result.rb index 6be7f690676..39b86c61a18 100644 --- a/lib/gitlab/auth/result.rb +++ b/lib/gitlab/auth/result.rb @@ -9,8 +9,7 @@ module Gitlab def lfs_deploy_token?(for_project) type == :lfs_deploy_token && - actor && - actor.projects.include?(for_project) + actor.try(:has_access_to?, for_project) end def success? diff --git a/lib/gitlab/git_access.rb b/lib/gitlab/git_access.rb index 19bdfc878b1..a7ad944e79e 100644 --- a/lib/gitlab/git_access.rb +++ b/lib/gitlab/git_access.rb @@ -161,7 +161,7 @@ module Gitlab def can_read_project? if deploy_key - project.public? || deploy_key.projects.include?(project) + project.public? || deploy_key.has_access_to?(project) elsif user user_access.can_read_project? else |