aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/application/middleware_test.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-08-23 01:21:43 +0200
committerXavier Noria <fxn@hashref.com>2010-08-23 01:21:43 +0200
commitb587bfd589cbb4469b9e49bfdd90f033d14adc9a (patch)
treed5fd06c8a1238dca62d3f3b512a6f19b63bc4b0e /railties/test/application/middleware_test.rb
parent9992a1a4bff1dd666298866c283ba18832da0914 (diff)
parent8d1ee434da3348089daa497980d1e24837ee8be6 (diff)
downloadrails-b587bfd589cbb4469b9e49bfdd90f033d14adc9a.tar.gz
rails-b587bfd589cbb4469b9e49bfdd90f033d14adc9a.tar.bz2
rails-b587bfd589cbb4469b9e49bfdd90f033d14adc9a.zip
Merge remote branch 'rails/master'
Diffstat (limited to 'railties/test/application/middleware_test.rb')
-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 1f127cee78..ed8f70dc44 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -28,6 +28,7 @@ module ApplicationTests
"ActionDispatch::RemoteIp",
"Rack::Sendfile",
"ActionDispatch::Callbacks",
+ "ActiveRecord::ConnectionAdapters::ConnectionManagement",
"ActiveRecord::QueryCache",
"ActionDispatch::Cookies",
"ActionDispatch::Session::CookieStore",