summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsh McKenzie <amckenzie@gitlab.com>2018-06-13 12:29:58 +1000
committerAsh McKenzie <amckenzie@gitlab.com>2018-06-19 16:18:17 +1000
commit060ee4ff27006ed51d3a5245a4b338bec35b0e72 (patch)
tree8c91fb3af52fa56e1f43c44fd5177f7ba52f43a7
parent0be66f4d40c3d2adff7a30137f1d188885a98ca8 (diff)
downloadgitlab-ce-6195-http-git-push-to-secondary-for-git-lfs-currently-does-not-work.tar.gz
Move check logic into #batch_operation_disallowed?6195-http-git-push-to-secondary-for-git-lfs-currently-does-not-work
-rw-r--r--app/controllers/projects/lfs_api_controller.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/projects/lfs_api_controller.rb b/app/controllers/projects/lfs_api_controller.rb
index ee4ed674110..3f4962b543d 100644
--- a/app/controllers/projects/lfs_api_controller.rb
+++ b/app/controllers/projects/lfs_api_controller.rb
@@ -93,7 +93,7 @@ class Projects::LfsApiController < Projects::GitHttpClientController
end
def lfs_check_batch_operation!
- if upload_request? && Gitlab::Database.read_only?
+ if batch_operation_disallowed?
render(
json: {
message: lfs_read_only_message
@@ -105,6 +105,11 @@ class Projects::LfsApiController < Projects::GitHttpClientController
end
# Overridden in EE
+ def batch_operation_disallowed?
+ upload_request? && Gitlab::Database.read_only?
+ end
+
+ # Overridden in EE
def lfs_read_only_message
_('You cannot write to this read-only GitLab instance.')
end