aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/abstract_controller/base.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-12-05 10:33:50 +0100
committerXavier Noria <fxn@hashref.com>2010-12-05 10:33:50 +0100
commit48386d245bc169d3a36e5f305927bd968b108fea (patch)
tree9156d3535c42e7f56af6e69fbbd5164ccb4fcc95 /actionpack/lib/abstract_controller/base.rb
parentb696dd70db651c6cb4a096dd0d5762416acd9917 (diff)
parente1d0d5ae81d2b02eebb1afbfb79edf0a2da2d48e (diff)
downloadrails-48386d245bc169d3a36e5f305927bd968b108fea.tar.gz
rails-48386d245bc169d3a36e5f305927bd968b108fea.tar.bz2
rails-48386d245bc169d3a36e5f305927bd968b108fea.zip
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'actionpack/lib/abstract_controller/base.rb')
-rw-r--r--actionpack/lib/abstract_controller/base.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/actionpack/lib/abstract_controller/base.rb b/actionpack/lib/abstract_controller/base.rb
index f83eaded88..c384fd0978 100644
--- a/actionpack/lib/abstract_controller/base.rb
+++ b/actionpack/lib/abstract_controller/base.rb
@@ -31,10 +31,9 @@ module AbstractController
# A list of all internal methods for a controller. This finds the first
# abstract superclass of a controller, and gets a list of all public
# instance methods on that abstract class. Public instance methods of
- # a controller would normally be considered action methods, so we
- # are removing those methods on classes declared as abstract
- # (ActionController::Metal and ActionController::Base are defined
- # as abstract)
+ # a controller would normally be considered action methods, so methods
+ # declared on abstract classes are being removed.
+ # (ActionController::Metal and ActionController::Base are defined as abstract)
def internal_methods
controller = self
controller = controller.superclass until controller.abstract?