Applies a patch to fix autoload + active_support conflicts: https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/2283-unnecessary-exception-raised-in-asdependenciesload_missing_constant
git-svn-id: file:///home/svn/framework3/trunk@12583 4d416f70-5f16-0410-b530-b9f4589650daunstable
parent
d0c93f7e49
commit
ea2da5f9ce
|
@ -403,7 +403,7 @@ module ActiveSupport #:nodoc:
|
||||||
raise ArgumentError, "A copy of #{from_mod} has been removed from the module tree but is still active!"
|
raise ArgumentError, "A copy of #{from_mod} has been removed from the module tree but is still active!"
|
||||||
end
|
end
|
||||||
|
|
||||||
raise ArgumentError, "#{from_mod} is not missing constant #{const_name}!" if uninherited_const_defined?(from_mod, const_name)
|
return from_mod.const_get(const_name) if uninherited_const_defined?(from_mod, const_name)
|
||||||
|
|
||||||
qualified_name = qualified_name_for from_mod, const_name
|
qualified_name = qualified_name_for from_mod, const_name
|
||||||
path_suffix = qualified_name.underscore
|
path_suffix = qualified_name.underscore
|
||||||
|
|
Loading…
Reference in New Issue