diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-09-15 21:16:38 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-09-15 21:16:38 +0200 |
| commit | 83b643a0145cf3f5b919cc61342ba0a824dfdcc9 (patch) | |
| tree | 41bf105a1b8d28b8385bfbccc033df544b7ebdfe /app/helpers | |
| parent | eed5c58d8542cef8cc4012a303c9bb963b7f5f20 (diff) | |
| parent | be09bcf074e6048aa9ba5f8dfb99754e6afbe156 (diff) | |
| download | gitlab-ce-83b643a0145cf3f5b919cc61342ba0a824dfdcc9.tar.gz | |
Merge remote-tracking branch 'origin/lfs-support-for-ssh' into per-build-token
# Conflicts:
# app/controllers/projects/git_http_client_controller.rb
# app/helpers/lfs_helper.rb
# lib/gitlab/auth.rb
# spec/requests/lfs_http_spec.rb
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/lfs_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/lfs_helper.rb b/app/helpers/lfs_helper.rb index d27b87ed5e4..0d6b72ff746 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? || user_can_download_code? || build_can_download_code? + project.public? || ci? || lfs_deploy_key? || user_can_download_code? || build_can_download_code? end def user_can_download_code? |