diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-11-15 10:19:51 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-11-15 10:19:51 +0000 |
commit | e98e7c60c5ff115f1d892a82722e0951e049e301 (patch) | |
tree | 65664b36c19344229fb4f2651cafde8879c2645a /app/helpers | |
parent | 05692e0bfab58ddc4082394c711b50b27d89f4b6 (diff) | |
parent | 50f047cadd6db4bc6e9f08beefbdf48f35ef876c (diff) | |
download | gitlab-ce-e98e7c60c5ff115f1d892a82722e0951e049e301.tar.gz |
Merge branch '24392-lfs-helper-refactor' into 'master'
Move the `objects` method to `LfsHelper` so that it is also available to `LfsStorageController`
## What does this MR do?
Move the `objects` method to `LfsHelper` so that it is also available to `LfsStorageController`
It is needed for the `lfs_check_access!` callback when the repository size limit is enabled (EE only).
cc @stanhu @ahanselka
## Why was this MR needed?
Errors shown here: gitlab-org/gitlab-ce#24392
Discovered thanks to gitlab-com/infrastructure#302
## What are the relevant issue numbers?
Fixes #24392
Fixes gitlab-com/support-forum#1280
See merge request !7417
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/lfs_helper.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/helpers/lfs_helper.rb b/app/helpers/lfs_helper.rb index d3966ba1f10..2425c3a8bc8 100644 --- a/app/helpers/lfs_helper.rb +++ b/app/helpers/lfs_helper.rb @@ -30,6 +30,10 @@ module LfsHelper ci? || lfs_deploy_token? || user_can_download_code? || build_can_download_code? end + def objects + @objects ||= (params[:objects] || []).to_a + end + def user_can_download_code? has_authentication_ability?(:download_code) && can?(user, :download_code, project) end |