Move constants and update for feedback42572-release-controller

2 files changed, 6 insertions, 5 deletions

diff --git a/lib/gitlab/middleware/read_only.rb b/lib/gitlab/middleware/read_only.rb
index 19b74c0c122..d9d5f90596f 100644
--- a/lib/gitlab/middleware/read_only.rb
+++ b/lib/gitlab/middleware/read_only.rb
@@ -1,8 +1,6 @@
 module Gitlab
   module Middleware
     class ReadOnly
-      DISALLOWED_METHODS = %w(POST PATCH PUT DELETE).freeze
-      APPLICATION_JSON = 'application/json'.freeze
       API_VERSIONS = (3..4)
 
       def self.internal_routes
diff --git a/lib/gitlab/middleware/read_only/controller.rb b/lib/gitlab/middleware/read_only/controller.rb
index 053cb6f0a9f..45b644e6510 100644
--- a/lib/gitlab/middleware/read_only/controller.rb
+++ b/lib/gitlab/middleware/read_only/controller.rb
@@ -2,6 +2,10 @@ module Gitlab
   module Middleware
     class ReadOnly
       class Controller
+        DISALLOWED_METHODS = %w(POST PATCH PUT DELETE).freeze
+        APPLICATION_JSON = 'application/json'.freeze
+        ERROR_MESSAGE = 'You cannot perform write operations on a read-only instance'.freeze
+
         def initialize(app, env)
           @app = app
           @env = env
@@ -10,12 +14,11 @@ module Gitlab
         def call
           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'
 
             if json_request?
-              return [403, { 'Content-Type' => 'application/json' }, [{ 'message' => error_message }.to_json]]
+              return [403, { 'Content-Type' => APPLICATION_JSON }, [{ 'message' => ERROR_MESSAGE }.to_json]]
             else
-              rack_flash.alert = error_message
+              rack_flash.alert = ERROR_MESSAGE
               rack_session['flash'] = rack_flash.to_session_value
 
               return [301, { 'Location' => last_visited_url }, []]