diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-09-19 13:38:58 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-09-19 13:45:28 +0200 |
| commit | 6d43c95b7011ec7ec4600e00bdc8df76bb39813c (patch) | |
| tree | f9ee7a65904f14286d302d1af51add94922fb50d /app | |
| parent | 79f60e2b5cf388416cdc5948e19ae0401f97d353 (diff) | |
| download | gitlab-ce-6d43c95b7011ec7ec4600e00bdc8df76bb39813c.tar.gz | |
Revert all changes introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects/git_http_client_controller.rb | 6 | ||||
| -rw-r--r-- | app/helpers/lfs_helper.rb | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/app/controllers/projects/git_http_client_controller.rb b/app/controllers/projects/git_http_client_controller.rb index ee9ea4bc8b2..d1a2c52d80a 100644 --- a/app/controllers/projects/git_http_client_controller.rb +++ b/app/controllers/projects/git_http_client_controller.rb @@ -132,12 +132,6 @@ class Projects::GitHttpClientController < Projects::ApplicationController authentication_project == project end - def lfs_deploy_key? - authentication_result.lfs_deploy_token? && - actor && - actor.projects.include?(project) - end - def authentication_has_download_access? has_authentication_ability?(:download_code) || has_authentication_ability?(:build_download_code) end diff --git a/app/helpers/lfs_helper.rb b/app/helpers/lfs_helper.rb index 018ca7d7bba..8e827664681 100644 --- a/app/helpers/lfs_helper.rb +++ b/app/helpers/lfs_helper.rb @@ -25,7 +25,7 @@ module LfsHelper def lfs_download_access? return false unless project.lfs_enabled? - project.public? || ci? || lfs_deploy_key? || user_can_download_code? || build_can_download_code? + project.public? || ci? || user_can_download_code? || build_can_download_code? end def user_can_download_code? |