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

Merge branch '24392-lfs-helper-refactor' into 'master'
e98e7c60 · Douwe Maan · 05692e0b · 50f047ca · e98e7c60 · e98e7c60
Commit e98e7c60 authored Nov 15, 2016 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

lfs_api_controller.rb app/controllers/projects/lfs_api_controller.rb +0 -4

lfs_helper.rb app/helpers/lfs_helper.rb +4 -0

No files found.
--- a/app/controllers/projects/lfs_api_controller.rb
+++ b/app/controllers/projects/lfs_api_controller.rb
@@ -31,10 +31,6 @@ class Projects::LfsApiController < Projects::GitHttpClientController

  private

-  def objects
-    @objects ||= (params[:objects] || []).to_a
-  end
-
  def existing_oids
    @existing_oids ||= begin
      storage_project.lfs_objects.where(oid: objects.map { |o| o['oid'].to_s }).pluck(:oid)

--- 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