aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-20 18:14:41 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-20 18:14:41 -0300
commit066907d1cb3e7e390287dff9c324a4091d76a97b (patch)
treeb691a6eddddc4b6af23754165a5329bc7c70bd40 /actionpack/lib
parentf73c52c3bc6b67c68726b789131259bb44dbf958 (diff)
parent0dfa6cb97c77775164f8009d6be82e697bd25add (diff)
downloadrails-066907d1cb3e7e390287dff9c324a4091d76a97b.tar.gz
rails-066907d1cb3e7e390287dff9c324a4091d76a97b.tar.bz2
rails-066907d1cb3e7e390287dff9c324a4091d76a97b.zip
Merge pull request #9802 from newsline/fix-broken-action-missing
Fix missing action_missing Conflicts: actionpack/CHANGELOG.md
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/metal/hide_actions.rb2
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 2aa6b7adaf..af36ffa240 100644
--- a/actionpack/lib/action_controller/metal/hide_actions.rb
+++ b/actionpack/lib/action_controller/metal/hide_actions.rb
@@ -27,7 +27,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