aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-05-04 08:35:35 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-05-04 08:35:35 -0700
commit8b6d2ef2f562c34ebc2ef547b0a18c31f5820569 (patch)
treeb1397a8374b465ea2f300e776de126bb88386bcc /actionpack/lib/action_dispatch.rb
parentd3ee8756c8b09b8524a9599926b02ededd27319c (diff)
parentbcc4537f2a0d37fc02d67e9564fa5c9c5555b3d5 (diff)
downloadrails-8b6d2ef2f562c34ebc2ef547b0a18c31f5820569.tar.gz
rails-8b6d2ef2f562c34ebc2ef547b0a18c31f5820569.tar.bz2
rails-8b6d2ef2f562c34ebc2ef547b0a18c31f5820569.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_dispatch.rb')
-rw-r--r--actionpack/lib/action_dispatch.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
index 5f6202d153..c882930e64 100644
--- a/actionpack/lib/action_dispatch.rb
+++ b/actionpack/lib/action_dispatch.rb
@@ -47,7 +47,8 @@ module ActionDispatch
autoload :Failsafe, 'action_dispatch/middleware/failsafe'
autoload :ParamsParser, 'action_dispatch/middleware/params_parser'
- autoload :Reloader, 'action_dispatch/middleware/reloader'
+ autoload :Rescue, 'action_dispatch/middleware/rescue'
+ autoload :ShowExceptions, 'action_dispatch/middleware/show_exceptions'
autoload :MiddlewareStack, 'action_dispatch/middleware/stack'
autoload :Assertions, 'action_dispatch/testing/assertions'