diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-06-13 08:38:41 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-06-13 08:38:41 +0000 |
| commit | 5d8c617ee24f6095705e6eef702afd4b06d755b4 (patch) | |
| tree | 99dd8ebddfcc23e70ae7c2e04eb9575e679ea0de | |
| parent | 8d9e0c0b8c419c024f67b58b4edc1efb2f99ca2e (diff) | |
| parent | 1499b02f73a6d8800a8132ea7b19a7e97fff1b4e (diff) | |
| download | gitlab-ce-5d8c617ee24f6095705e6eef702afd4b06d755b4.tar.gz | |
Merge branch 'blackst0ne-rails5-update-middlewares' into 'master'
[Rails5] Pass class references instead of strings to middleware builder
See merge request gitlab-org/gitlab-ce!19729
| -rw-r--r-- | config/application.rb | 3 | ||||
| -rw-r--r-- | config/environments/test.rb | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/config/application.rb b/config/application.rb index d379d611074..95f6d2c9af1 100644 --- a/config/application.rb +++ b/config/application.rb @@ -12,6 +12,7 @@ module Gitlab require_dependency Rails.root.join('lib/gitlab/redis/shared_state') require_dependency Rails.root.join('lib/gitlab/request_context') require_dependency Rails.root.join('lib/gitlab/current_settings') + require_dependency Rails.root.join('lib/gitlab/middleware/read_only') # Settings in config/environments/* take precedence over those specified here. # Application configuration should go into files in config/initializers @@ -175,7 +176,7 @@ module Gitlab ENV['GIT_TERMINAL_PROMPT'] = '0' # Gitlab Read-only middleware support - config.middleware.insert_after ActionDispatch::Flash, '::Gitlab::Middleware::ReadOnly' + config.middleware.insert_after ActionDispatch::Flash, ::Gitlab::Middleware::ReadOnly config.generators do |g| g.factory_bot false diff --git a/config/environments/test.rb b/config/environments/test.rb index 1849c984351..af1011a1ab1 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -1,7 +1,7 @@ Rails.application.configure do # Make sure the middleware is inserted first in middleware chain - config.middleware.insert_before('ActionDispatch::Static', 'Gitlab::Testing::RequestBlockerMiddleware') - config.middleware.insert_before('ActionDispatch::Static', 'Gitlab::Testing::RequestInspectorMiddleware') + config.middleware.insert_before(ActionDispatch::Static, Gitlab::Testing::RequestBlockerMiddleware) + config.middleware.insert_before(ActionDispatch::Static, Gitlab::Testing::RequestInspectorMiddleware) # Settings specified here will take precedence over those in config/application.rb |