aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2013-06-17 17:49:11 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2013-06-17 17:50:18 -0700
commit56cb34d8e59ef93e1ad83d4c9e03183712438413 (patch)
tree91c1f697d1aec260f7f38c5b69522aea8196f71d /activesupport/lib/active_support
parent1d4f96601dfa81059ca802b3186530950822fa26 (diff)
downloadrails-56cb34d8e59ef93e1ad83d4c9e03183712438413.tar.gz
rails-56cb34d8e59ef93e1ad83d4c9e03183712438413.tar.bz2
rails-56cb34d8e59ef93e1ad83d4c9e03183712438413.zip
be consistent about parameter types passed to new_constants_in
Diffstat (limited to 'activesupport/lib/active_support')
-rw-r--r--activesupport/lib/active_support/dependencies.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index d38e4b0732..fc4250c740 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -416,7 +416,7 @@ module ActiveSupport #:nodoc:
def load_file(path, const_paths = loadable_constants_for_path(path))
log_call path, const_paths
const_paths = [const_paths].compact unless const_paths.is_a? Array
- parent_paths = const_paths.collect { |const_path| const_path[/.*(?=::)/] || :Object }
+ parent_paths = const_paths.collect { |const_path| const_path[/.*(?=::)/] || ::Object }
result = nil
newly_defined_paths = new_constants_in(*parent_paths) do