From 6efdb7177bcafe5034d210759446deec1feb6880 Mon Sep 17 00:00:00 2001
From: Leonid Batizhevsky <l.batizhevsky@fun-box.ru>
Date: Thu, 9 Apr 2015 21:05:49 +0400
Subject: Allow log remote ip addres when
 config.action_dispatch.trusted_proxies passed

---
 railties/test/application/middleware_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/test')

diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index be41dcb299..5cbd457111 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",
-- 
cgit v1.2.3