From 0012de8c8a6642db40c13273f32c396afaa629eb Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Wed, 10 Aug 2016 16:48:21 +0200 Subject: [PATCH] Rename lfs_enabled helper method --- app/controllers/projects/lfs_api_controller.rb | 2 +- app/controllers/projects/lfs_storage_controller.rb | 2 +- app/helpers/lfs_helper.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/projects/lfs_api_controller.rb b/app/controllers/projects/lfs_api_controller.rb index 1fa9cd8f47f..ece49dcd922 100644 --- a/app/controllers/projects/lfs_api_controller.rb +++ b/app/controllers/projects/lfs_api_controller.rb @@ -1,7 +1,7 @@ class Projects::LfsApiController < Projects::GitHttpClientController include LfsHelper - before_action :lfs_enabled! + before_action :require_lfs_enabled! before_action :lfs_check_access!, except: [:deprecated] def batch diff --git a/app/controllers/projects/lfs_storage_controller.rb b/app/controllers/projects/lfs_storage_controller.rb index d0895e1324c..6bde0a527ff 100644 --- a/app/controllers/projects/lfs_storage_controller.rb +++ b/app/controllers/projects/lfs_storage_controller.rb @@ -1,7 +1,7 @@ class Projects::LfsStorageController < Projects::GitHttpClientController include LfsHelper - before_action :lfs_enabled! + before_action :require_lfs_enabled! before_action :lfs_check_access! def download diff --git a/app/helpers/lfs_helper.rb b/app/helpers/lfs_helper.rb index ae230ee1878..eb651e3687e 100644 --- a/app/helpers/lfs_helper.rb +++ b/app/helpers/lfs_helper.rb @@ -1,5 +1,5 @@ module LfsHelper - def lfs_enabled! + def require_lfs_enabled! return if Gitlab.config.lfs.enabled render(