diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-12-31 08:18:18 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-12-31 08:30:18 +1030 |
| commit | 2c5190e3299c83a357c8bf8010d6ca7bff99c1b5 (patch) | |
| tree | f97567d61700cad7587464446154af1c7509efa2 /railties/test | |
| parent | 8ebd34b249fbcc392d058e18538aeca1f2fb5293 (diff) | |
| parent | 6efdb7177bcafe5034d210759446deec1feb6880 (diff) | |
| download | rails-2c5190e3299c83a357c8bf8010d6ca7bff99c1b5.tar.gz rails-2c5190e3299c83a357c8bf8010d6ca7bff99c1b5.tar.bz2 rails-2c5190e3299c83a357c8bf8010d6ca7bff99c1b5.zip | |
Merge pull request #27515 from kbrock/fix_log_remote_ip_before_dispatcher_ips_settings
Allow log remote ip addres when config.action_dispatch.trusted_proxie…
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/application/middleware_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb index be41dcb299..71d822bb41 100644 --- a/railties/test/application/middleware_test.rb +++ b/railties/test/application/middleware_test.rb @@ -30,10 +30,10 @@ module ApplicationTests "Rack::Runtime", "Rack::MethodOverride", "ActionDispatch::RequestId", + "ActionDispatch::RemoteIp", # Must come before Rails::Rack::Logger to properly log request_id "Rails::Rack::Logger", # must come after Rack::MethodOverride to properly log overridden methods "ActionDispatch::ShowExceptions", "ActionDispatch::DebugExceptions", - "ActionDispatch::RemoteIp", "ActionDispatch::Reloader", "ActionDispatch::Callbacks", "ActiveRecord::Migration::CheckPending", @@ -58,10 +58,10 @@ module ApplicationTests "ActiveSupport::Cache::Strategy::LocalCache", "Rack::Runtime", "ActionDispatch::RequestId", + "ActionDispatch::RemoteIp", "Rails::Rack::Logger", # must come after Rack::MethodOverride to properly log overridden methods "ActionDispatch::ShowExceptions", "ActionDispatch::DebugExceptions", - "ActionDispatch::RemoteIp", "ActionDispatch::Reloader", "ActionDispatch::Callbacks", "Rack::Head", |