diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2013-11-02 15:40:39 -0700 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2013-11-02 15:40:39 -0700 |
| commit | 6d30219c2734f2678d74a54b791a311748b3e64f (patch) | |
| tree | b9da7bebd2e3c375afab44791fd4205254f13b50 /actionpack/lib/action_dispatch/middleware/exception_wrapper.rb | |
| parent | 423249504a2b468d7a273cbe6accf4f21cb0e643 (diff) | |
| parent | a2f27385f60292c77e5e29a9568f1888a7c3d214 (diff) | |
| download | rails-6d30219c2734f2678d74a54b791a311748b3e64f.tar.gz rails-6d30219c2734f2678d74a54b791a311748b3e64f.tar.bz2 rails-6d30219c2734f2678d74a54b791a311748b3e64f.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/exception_wrapper.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/exception_wrapper.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb index daddaccadd..37bf9c8c9f 100644 --- a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb +++ b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb @@ -15,8 +15,7 @@ module ActionDispatch 'ActionController::InvalidAuthenticityToken' => :unprocessable_entity, 'ActionDispatch::ParamsParser::ParseError' => :bad_request, 'ActionController::BadRequest' => :bad_request, - 'ActionController::ParameterMissing' => :bad_request, - 'ActionController::EmptyParameter' => :bad_request + 'ActionController::ParameterMissing' => :bad_request ) cattr_accessor :rescue_templates |