summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordigitalMoksha <bwalker@gitlab.com>2017-11-21 15:35:30 +0100
committerdigitalMoksha <bwalker@gitlab.com>2017-11-21 15:35:30 +0100
commitaeb2f49fd4c65b9f5e3b2d7858a250a747a0f702 (patch)
treede944b269071ff7b75970e84783b80d4095e58a4
parent91075c8237307e09c2be8a88ffb3711fd62417d1 (diff)
downloadgitlab-ce-aeb2f49fd4c65b9f5e3b2d7858a250a747a0f702.tar.gz
Revert "check for `read_only?` first before seeing if request is disallowed"
This reverts commit 91075c8237307e09c2be8a88ffb3711fd62417d1.
-rw-r--r--lib/gitlab/middleware/read_only.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/middleware/read_only.rb b/lib/gitlab/middleware/read_only.rb
index f8b9c5bff4c..c26656704d7 100644
--- a/lib/gitlab/middleware/read_only.rb
+++ b/lib/gitlab/middleware/read_only.rb
@@ -14,7 +14,7 @@ module Gitlab
@env = env
@route_hash = nil
- if Gitlab::Database.read_only? && disallowed_request?
+ if disallowed_request? && Gitlab::Database.read_only?
Rails.logger.debug('GitLab ReadOnly: preventing possible non read-only operation')
error_message = 'You cannot do writing operations on a read-only GitLab instance'