diff options
author | Brian Alexander <balexand@gmail.com> | 2013-01-15 17:07:13 -0700 |
---|---|---|
committer | Brian Alexander <balexand@gmail.com> | 2013-01-15 17:45:34 -0700 |
commit | 8e221127abf5262183c20e981f7cf1ff4bfe1a4f (patch) | |
tree | 611f8035f49adff3aa83b7151aa138ade0abd8a4 /actionpack/lib | |
parent | 8492396e9c1fe21036783d9785ed42c27dee9201 (diff) | |
download | rails-8e221127abf5262183c20e981f7cf1ff4bfe1a4f.tar.gz rails-8e221127abf5262183c20e981f7cf1ff4bfe1a4f.tar.bz2 rails-8e221127abf5262183c20e981f7cf1ff4bfe1a4f.zip |
strong parameters exception handling
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_controller/metal/strong_parameters.rb | 6 | ||||
-rw-r--r-- | actionpack/lib/action_dispatch/middleware/exception_wrapper.rb | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/actionpack/lib/action_controller/metal/strong_parameters.rb b/actionpack/lib/action_controller/metal/strong_parameters.rb index 941b6e210f..e6e58ce6cd 100644 --- a/actionpack/lib/action_controller/metal/strong_parameters.rb +++ b/actionpack/lib/action_controller/metal/strong_parameters.rb @@ -373,12 +373,6 @@ module ActionController extend ActiveSupport::Concern include ActiveSupport::Rescuable - included do - rescue_from(ActionController::ParameterMissing) do |parameter_missing_exception| - render text: "Required parameter missing: #{parameter_missing_exception.param}", status: :bad_request - end - end - # Returns a new ActionController::Parameters object that # has been instantiated with the <tt>request.parameters</tt>. def params diff --git a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb index 869d0aa7af..7489ce8028 100644 --- a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb +++ b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb @@ -12,7 +12,8 @@ module ActionDispatch 'ActionController::NotImplemented' => :not_implemented, 'ActionController::UnknownFormat' => :not_acceptable, 'ActionController::InvalidAuthenticityToken' => :unprocessable_entity, - 'ActionController::BadRequest' => :bad_request + 'ActionController::BadRequest' => :bad_request, + 'ActionController::ParameterMissing' => :bad_request ) cattr_accessor :rescue_templates |