diff options
| author | Gannon McGibbon <gannon.mcgibbon@gmail.com> | 2018-10-02 14:39:44 -0400 |
|---|---|---|
| committer | Gannon McGibbon <gannon.mcgibbon@gmail.com> | 2018-10-02 15:31:29 -0400 |
| commit | c401c43850e79a4d994e22dd8d82a69612bb947f (patch) | |
| tree | c48cf5beea7710c5c75e5fc238f7fb45d8fa2c6c /activesupport | |
| parent | 004fda35688015350eef6152d0c5dbfa3f26a713 (diff) | |
| download | rails-c401c43850e79a4d994e22dd8d82a69612bb947f.tar.gz rails-c401c43850e79a4d994e22dd8d82a69612bb947f.tar.bz2 rails-c401c43850e79a4d994e22dd8d82a69612bb947f.zip | |
Fix call sites
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/dependencies.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb index 063d8d1587..66e0bea00e 100644 --- a/activesupport/lib/active_support/dependencies.rb +++ b/activesupport/lib/active_support/dependencies.rb @@ -521,8 +521,8 @@ module ActiveSupport #:nodoc: end elsif mod = autoload_module!(from_mod, const_name, qualified_name, path_suffix) return mod - elsif (parent = from_mod.parent) && parent != from_mod && - ! from_mod.parents.any? { |p| p.const_defined?(const_name, false) } + elsif (parent = from_mod.module_parent) && parent != from_mod && + ! from_mod.module_parents.any? { |p| p.const_defined?(const_name, false) } # If our parents do not have a constant named +const_name+ then we are free # to attempt to load upwards. If they do have such a constant, then this # const_missing must be due to from_mod::const_name, which should not |