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 /actionpack/test/controller | |
| 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 'actionpack/test/controller')
| -rw-r--r-- | actionpack/test/controller/show_exceptions_test.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/test/controller/show_exceptions_test.rb b/actionpack/test/controller/show_exceptions_test.rb index 74067cb895..5eff1eb09d 100644 --- a/actionpack/test/controller/show_exceptions_test.rb +++ b/actionpack/test/controller/show_exceptions_test.rb @@ -3,6 +3,7 @@ require 'abstract_unit' module ShowExceptions class ShowExceptionsController < ActionController::Base use ActionDispatch::ShowExceptions + use ActionDispatch::DebugExceptions def boom raise 'boom!' |