diff options
| author | Xavier Noria <fxn@hashref.com> | 2015-03-28 10:01:25 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2015-03-28 10:01:25 +0100 |
| commit | 8798788c65b0603caf4b55fe7e961e99f2ea4bde (patch) | |
| tree | effbc275fc723a581b69cd1aec35ceb9d950277d /actionpack/lib | |
| parent | 8bf2825205ad392c923070e722fc8d39687520e3 (diff) | |
| parent | 1b0526eaac87342b5413183e082b51b10a6ace6e (diff) | |
| download | rails-8798788c65b0603caf4b55fe7e961e99f2ea4bde.tar.gz rails-8798788c65b0603caf4b55fe7e961e99f2ea4bde.tar.bz2 rails-8798788c65b0603caf4b55fe7e961e99f2ea4bde.zip | |
Merge pull request #19544 from shuhei/fix-parameters-const-missing
Return super in ActionController::Parameters.const_missing
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/metal/strong_parameters.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/strong_parameters.rb b/actionpack/lib/action_controller/metal/strong_parameters.rb index f19c4201ba..e30c9c5ade 100644 --- a/actionpack/lib/action_controller/metal/strong_parameters.rb +++ b/actionpack/lib/action_controller/metal/strong_parameters.rb @@ -117,7 +117,7 @@ module ActionController self.always_permitted_parameters = %w( controller action ) def self.const_missing(const_name) - super unless const_name == :NEVER_UNPERMITTED_PARAMS + return super unless const_name == :NEVER_UNPERMITTED_PARAMS ActiveSupport::Deprecation.warn(<<-MSG.squish) `ActionController::Parameters::NEVER_UNPERMITTED_PARAMS` has been deprecated. Use `ActionController::Parameters.always_permitted_parameters` instead. |