diff options
| author | Xavier Noria <fxn@hashref.com> | 2019-02-21 15:46:23 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-21 15:46:23 -0800 |
| commit | 7351ccdb880ca4b69d24b2615019ed902652f45e (patch) | |
| tree | c8f9cc23d29690c172ea8e34a9f2ca16506d4a0e /activesupport | |
| parent | 4c68fd2b3500c13a795b416cdc7a640a0b4f3b28 (diff) | |
| parent | b7fe3bddef690f4188905dd7f6f57e6a876d239c (diff) | |
| download | rails-7351ccdb880ca4b69d24b2615019ed902652f45e.tar.gz rails-7351ccdb880ca4b69d24b2615019ed902652f45e.tar.bz2 rails-7351ccdb880ca4b69d24b2615019ed902652f45e.zip | |
Merge pull request #35363 from rails/zeitwerk-1.3.0
Bumps Zeitwerk
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/activesupport.gemspec | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/dependencies/zeitwerk_integration.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec index 2fa0623a9c..3913ce19c5 100644 --- a/activesupport/activesupport.gemspec +++ b/activesupport/activesupport.gemspec @@ -34,5 +34,5 @@ Gem::Specification.new do |s| s.add_dependency "tzinfo", "~> 1.1" s.add_dependency "minitest", "~> 5.1" s.add_dependency "concurrent-ruby", "~> 1.0", ">= 1.0.2" - s.add_dependency "zeitwerk", "~> 1.2" + s.add_dependency "zeitwerk", "~> 1.3" end diff --git a/activesupport/lib/active_support/dependencies/zeitwerk_integration.rb b/activesupport/lib/active_support/dependencies/zeitwerk_integration.rb index 939ada123d..297bde5534 100644 --- a/activesupport/lib/active_support/dependencies/zeitwerk_integration.rb +++ b/activesupport/lib/active_support/dependencies/zeitwerk_integration.rb @@ -28,7 +28,7 @@ module ActiveSupport end def verbose=(verbose) - l = verbose ? (logger || Rails.logger).method(:debug) : nil + l = verbose ? logger || Rails.logger : nil Rails.autoloaders.each { |autoloader| autoloader.logger = l } end |