aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application/configuration.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2019-02-13 10:41:28 -0800
committerXavier Noria <fxn@hashref.com>2019-02-13 12:27:53 -0800
commitc36b6c8d38c33fd03594ba54aaed0e945ddfe0ec (patch)
tree0946312983391ba1178a081eaa09f66e62f5efb6 /railties/lib/rails/application/configuration.rb
parentb4dd69e59b3cb5c34bd58339d5b9a749e2cd82f3 (diff)
downloadrails-c36b6c8d38c33fd03594ba54aaed0e945ddfe0ec.tar.gz
rails-c36b6c8d38c33fd03594ba54aaed0e945ddfe0ec.tar.bz2
rails-c36b6c8d38c33fd03594ba54aaed0e945ddfe0ec.zip
Let Zeitwerk be a dependency of Active Support
Zeitwerk is a strong dependency, planned to replace AS::Dependencies. A line in the generated Gemfile does not convey this as much.
Diffstat (limited to 'railties/lib/rails/application/configuration.rb')
-rw-r--r--railties/lib/rails/application/configuration.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 16fbc99e7a..af3ec36064 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -271,7 +271,11 @@ module Rails
end
def autoloader=(autoloader)
- if %i(classic zeitwerk).include?(autoloader)
+ case autoloader
+ when :classic
+ @autoloader = autoloader
+ when :zeitwerk
+ require "zeitwerk"
@autoloader = autoloader
else
raise ArgumentError, "config.autoloader may be :classic or :zeitwerk, got #{autoloader.inspect} instead"