diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-20 18:14:41 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-20 18:22:31 -0300 |
| commit | 2c8f34995378e4a18711cf5f947e8465227d3748 (patch) | |
| tree | c586517d5eaa0a378f7546bac398911b3f6b8148 /actionpack/lib/action_controller | |
| parent | 7e8a74d40125be9d8afc8571ab7e28c67662c484 (diff) | |
| download | rails-2c8f34995378e4a18711cf5f947e8465227d3748.tar.gz rails-2c8f34995378e4a18711cf5f947e8465227d3748.tar.bz2 rails-2c8f34995378e4a18711cf5f947e8465227d3748.zip | |
Merge pull request #9802 from newsline/fix-broken-action-missing
Fix missing action_missing
Conflicts:
actionpack/CHANGELOG.md
Conflicts:
actionpack/test/controller/base_test.rb
Fixes #9799
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/hide_actions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/hide_actions.rb b/actionpack/lib/action_controller/metal/hide_actions.rb index 109484d88c..1ded166491 100644 --- a/actionpack/lib/action_controller/metal/hide_actions.rb +++ b/actionpack/lib/action_controller/metal/hide_actions.rb @@ -28,7 +28,7 @@ module ActionController end def visible_action?(action_name) - action_methods.include?(action_name) + not hidden_actions.include?(action_name) end # Overrides AbstractController::Base#action_methods to remove any methods |