diff options
author | Xavier Noria <fxn@hashref.com> | 2019-04-07 12:30:34 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2019-04-07 13:05:26 +0200 |
commit | 57c7cbb1623c0e8befc58988a34bbb9896fd226a (patch) | |
tree | 56160343a026cd0fc0bf7e64c988b6937c224aed /activesupport/lib/active_support/dependencies | |
parent | c9e4c848eeeb8999b778fa1ae52185ca5537fffe (diff) | |
download | rails-57c7cbb1623c0e8befc58988a34bbb9896fd226a.tar.gz rails-57c7cbb1623c0e8befc58988a34bbb9896fd226a.tar.bz2 rails-57c7cbb1623c0e8befc58988a34bbb9896fd226a.zip |
depend on Zeitwerk 2
Diffstat (limited to 'activesupport/lib/active_support/dependencies')
-rw-r--r-- | activesupport/lib/active_support/dependencies/zeitwerk_integration.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/dependencies/zeitwerk_integration.rb b/activesupport/lib/active_support/dependencies/zeitwerk_integration.rb index a43d03cf09..faf9edef27 100644 --- a/activesupport/lib/active_support/dependencies/zeitwerk_integration.rb +++ b/activesupport/lib/active_support/dependencies/zeitwerk_integration.rb @@ -51,15 +51,15 @@ module ActiveSupport end class << self - def take_over - setup_autoloaders + def take_over(enable_reloading:) + setup_autoloaders(enable_reloading) freeze_paths decorate_dependencies end private - def setup_autoloaders + def setup_autoloaders(enable_reloading) Dependencies.autoload_paths.each do |autoload_path| # Zeitwerk only accepts existing directories in `push_dir` to # prevent misconfigurations. @@ -72,6 +72,7 @@ module ActiveSupport autoloader.do_not_eager_load(autoload_path) unless eager_load?(autoload_path) end + Rails.autoloaders.main.enable_reloading if enable_reloading Rails.autoloaders.each(&:setup) end |