aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/dependencies.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport/lib/dependencies.rb')
-rw-r--r--activesupport/lib/dependencies.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/dependencies.rb b/activesupport/lib/dependencies.rb
index 1035bf714d..dc6c852c12 100644
--- a/activesupport/lib/dependencies.rb
+++ b/activesupport/lib/dependencies.rb
@@ -31,7 +31,7 @@ module Dependencies
old_loaded.each do |file_name|
begin
- silence_warnings { load("#{file_name}.rb") }
+ silence_warnings { load("#{file_name}.rb") } unless loaded.include?(file_name)
rescue LoadError
# The association didn't reside in its own file, so we assume it was required by other means
end