diff options
author | Yves Senn <yves.senn@gmail.com> | 2015-06-22 08:44:16 +0200 |
---|---|---|
committer | Yves Senn <yves.senn@gmail.com> | 2015-06-22 08:49:27 +0200 |
commit | 8bf60b02b8501a5d33f6ae68a0077da2a92d310f (patch) | |
tree | 04c6e5829d6015ff21ee45353994ceea7f79234e /actionpack/lib/action_controller/metal | |
parent | 9dbe3f9aa8325915907e313608504351a1ba19bb (diff) | |
parent | 9f62180ab2802600195940082a818f3cdd6d5781 (diff) | |
download | rails-8bf60b02b8501a5d33f6ae68a0077da2a92d310f.tar.gz rails-8bf60b02b8501a5d33f6ae68a0077da2a92d310f.tar.bz2 rails-8bf60b02b8501a5d33f6ae68a0077da2a92d310f.zip |
Merge pull request #20659 from vngrs/strong_parameters_unpermitted_parameters_wrong_doc_fix
Fix the documentation about ActionController::UnpermittedParameters [ci skip]
Diffstat (limited to 'actionpack/lib/action_controller/metal')
-rw-r--r-- | actionpack/lib/action_controller/metal/strong_parameters.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal/strong_parameters.rb b/actionpack/lib/action_controller/metal/strong_parameters.rb index b17c04a299..09867e2407 100644 --- a/actionpack/lib/action_controller/metal/strong_parameters.rb +++ b/actionpack/lib/action_controller/metal/strong_parameters.rb @@ -23,11 +23,13 @@ module ActionController end end - # Raised when a supplied parameter is not expected. + # Raised when a supplied parameter is not expected and + # ActionController::Parameters.action_on_unpermitted_parameters + # is set to <tt>:raise</tt>. # # params = ActionController::Parameters.new(a: "123", b: "456") # params.permit(:c) - # # => ActionController::UnpermittedParameters: found unexpected keys: a, b + # # => ActionController::UnpermittedParameters: found unpermitted parameters: a, b class UnpermittedParameters < IndexError attr_reader :params # :nodoc: |