From 154ee7b4b0318e08997a8f1251e3fd77cbb591f0 Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Sun, 25 Oct 2020 15:51:36 +0900 Subject: [PATCH] Revert "Don't enable Zeitwerk on MRI in 6.1 load_defaults" This reverts commit 379db92364c4c212ac22a20dac72cd502156710d. Reason: https://github.com/rails/rails/commit/94ba417ecec8272700805268b76be7de9a470a59#r41923157 --- railties/lib/rails/application/configuration.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 933a8e0a22a..c2a0ccf7479 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -160,7 +160,7 @@ module Rails when "6.1" load_defaults "6.0" - self.autoloader = :zeitwerk if RUBY_ENGINE == "truffleruby" + self.autoloader = :zeitwerk if %w[ruby truffleruby].include?(RUBY_ENGINE) if respond_to?(:active_record) active_record.has_many_inversing = true