aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/application
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2011-10-25 17:22:55 -0500
committerDavid Heinemeier Hansson <david@loudthinking.com>2011-10-25 17:22:55 -0500
commit1d9ab88ee6360f54197ce21624d844425ec627b3 (patch)
tree252b3daf0d84e2a050c0da97b758f9ba06a3545e /railties/test/application
parent5daf07704ad21d885661216281ffc48b6ea6adfb (diff)
parent8aabdc69b7c498770e4c2864dad3e2790a40d10f (diff)
downloadrails-1d9ab88ee6360f54197ce21624d844425ec627b3.tar.gz
rails-1d9ab88ee6360f54197ce21624d844425ec627b3.tar.bz2
rails-1d9ab88ee6360f54197ce21624d844425ec627b3.zip
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'railties/test/application')
-rw-r--r--railties/test/application/middleware_test.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index 093cb6ca2a..4703a59326 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -30,6 +30,7 @@ module ApplicationTests
"ActiveSupport::Cache::Strategy::LocalCache",
"Rack::Runtime",
"Rack::MethodOverride",
+ "ActionDispatch::RequestId",
"Rails::Rack::Logger", # must come after Rack::MethodOverride to properly log overridden methods
"ActionDispatch::ShowExceptions",
"ActionDispatch::RemoteIp",