summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2016-08-10 16:48:21 +0200
committerJacob Vosmaer <jacob@gitlab.com>2016-08-10 16:48:21 +0200
commit0012de8c8a6642db40c13273f32c396afaa629eb (patch)
treee74e3df6a3b59dcaeadea0fbce060e2d81690a07
parent7dff0946a7ea8c47cf531067ac752cf900927c44 (diff)
downloadgitlab-ce-0012de8c8a6642db40c13273f32c396afaa629eb.tar.gz
Rename lfs_enabled helper method
-rw-r--r--app/controllers/projects/lfs_api_controller.rb2
-rw-r--r--app/controllers/projects/lfs_storage_controller.rb2
-rw-r--r--app/helpers/lfs_helper.rb2
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(