diff options
author | Xavier Noria <fxn@hashref.com> | 2010-09-14 20:07:29 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2010-09-14 20:07:29 +0200 |
commit | dd6efe98b62946ae4d4df0672292449226b8d6fc (patch) | |
tree | 8854f46462eacc6355ca6f8da3d7111a57e036ea /activesupport | |
parent | 9362ef6e21e44341a5ef9d85ece468f407357ceb (diff) | |
parent | b59a8d42c300651ad3384d4dab326454c088cbcc (diff) | |
download | rails-dd6efe98b62946ae4d4df0672292449226b8d6fc.tar.gz rails-dd6efe98b62946ae4d4df0672292449226b8d6fc.tar.bz2 rails-dd6efe98b62946ae4d4df0672292449226b8d6fc.zip |
Merge remote branch 'docrails/master'
Diffstat (limited to 'activesupport')
-rw-r--r-- | activesupport/lib/active_support/dependencies.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb index dc6484f387..09bdb577ad 100644 --- a/activesupport/lib/active_support/dependencies.rb +++ b/activesupport/lib/active_support/dependencies.rb @@ -83,13 +83,13 @@ module ActiveSupport #:nodoc: super { |h,k| h[k] = [] } end - # return a list of new constants found since the last call to watch_modules + # return a list of new constants found since the last call to watch_namespaces def new_constants constants = [] # Grab the list of namespaces that we're looking for new constants under @watching.last.each do |namespace| - # Retrieve the constants that were present under the namespace when watch_modules + # Retrieve the constants that were present under the namespace when watch_namespaces # was originally called original_constants = self[namespace].last @@ -115,7 +115,7 @@ module ActiveSupport #:nodoc: end constants ensure - # A call to new_constants is always called after a call to watch_modules + # A call to new_constants is always called after a call to watch_namespaces pop_modules(@watching.pop) end |