aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/abstract_controller
diff options
context:
space:
mode:
authorbrainopia <brainopia@evilmartians.com>2015-01-06 23:33:31 +0300
committerbrainopia <brainopia@evilmartians.com>2015-01-06 23:40:45 +0300
commit08d3f0e3b3701fa7f52615e266cad433138314ac (patch)
tree8579eeea57dd322edb8eb404ce2e22708da02d13 /actionpack/lib/abstract_controller
parent362acba04edd8154f6898f5c7e8c7c1e4546b20c (diff)
downloadrails-08d3f0e3b3701fa7f52615e266cad433138314ac.tar.gz
rails-08d3f0e3b3701fa7f52615e266cad433138314ac.tar.bz2
rails-08d3f0e3b3701fa7f52615e266cad433138314ac.zip
Remove ActionController::HideActions (closes #18336)
Diffstat (limited to 'actionpack/lib/abstract_controller')
-rw-r--r--actionpack/lib/abstract_controller/base.rb16
1 files changed, 2 insertions, 14 deletions
diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb
index 8c7cec3561..c95b9a4097 100644
--- a/actionpack/lib/abstract_controller/base.rb
+++ b/actionpack/lib/abstract_controller/base.rb
@@ -57,21 +57,11 @@ module AbstractController
controller.public_instance_methods(true)
end
- # The list of hidden actions. Defaults to an empty array.
- # This can be modified by other modules or subclasses
- # to specify particular actions as hidden.
- #
- # ==== Returns
- # * <tt>Array</tt> - An array of method names that should not be considered actions.
- def hidden_actions
- []
- end
-
# A list of method names that should be considered actions. This
# includes all public instance methods on a controller, less
# any internal methods (see internal_methods), adding back in
# any methods that are internal, but still exist on the class
- # itself. Finally, hidden_actions are removed.
+ # itself.
#
# ==== Returns
# * <tt>Set</tt> - A set of all methods that should be considered actions.
@@ -82,9 +72,7 @@ module AbstractController
# Except for public instance methods of Base and its ancestors
internal_methods +
# Be sure to include shadowed public instance methods of this class
- public_instance_methods(false)).uniq.map(&:to_s) -
- # And always exclude explicitly hidden actions
- hidden_actions.to_a
+ public_instance_methods(false)).uniq.map(&:to_s)
methods.to_set
end