diff options
| author | José Valim <jose.valim@gmail.com> | 2011-12-01 21:18:47 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-12-01 21:18:47 +0100 |
| commit | 07f90f6bec702a6e08d65a33682ddd244050375f (patch) | |
| tree | eb76e17734ae44e08a75b8d74740e6e600422ae6 /railties/lib/rails | |
| parent | 83d29a283ceb13ff431da535e8cc35db6828016c (diff) | |
| parent | 6a4606d3a64e60189ea4ba5243830dcd97e6de14 (diff) | |
| download | rails-07f90f6bec702a6e08d65a33682ddd244050375f.tar.gz rails-07f90f6bec702a6e08d65a33682ddd244050375f.tar.bz2 rails-07f90f6bec702a6e08d65a33682ddd244050375f.zip | |
Merge branch 'exceptions' with the following features:
* A Railtie API for registering new exceptions and their respective status code (check Active Record railtie for an example)
* Extraction of ShowExceptions middleware logging and debugging features into a middleware called DebugExceptions
Conflicts:
actionpack/CHANGELOG.md
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/application.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 2a62446a04..f5f47acfbc 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -195,10 +195,13 @@ module Rails middleware.use ::ActionDispatch::RequestId middleware.use ::Rails::Rack::Logger, config.log_tags # must come after Rack::MethodOverride to properly log overridden methods middleware.use ::ActionDispatch::ShowExceptions + middleware.use ::ActionDispatch::DebugExceptions middleware.use ::ActionDispatch::RemoteIp, config.action_dispatch.ip_spoofing_check, config.action_dispatch.trusted_proxies + if config.action_dispatch.x_sendfile_header.present? middleware.use ::Rack::Sendfile, config.action_dispatch.x_sendfile_header end + middleware.use ::ActionDispatch::Reloader unless config.cache_classes middleware.use ::ActionDispatch::Callbacks middleware.use ::ActionDispatch::Cookies |