diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-02-02 06:31:50 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-02-02 06:31:50 +1030 |
| commit | f8167acc41d514847e07a305262481db6a149dd6 (patch) | |
| tree | b5e3c9235c7404b18c3f1b5aa7b1802140a65d50 /railties/lib | |
| parent | f3e6e80e13103cbf210c95b5f601bc448a0aecaa (diff) | |
| parent | f836630f8cdf53a06259cc22ac842bbfa6376f65 (diff) | |
| download | rails-f8167acc41d514847e07a305262481db6a149dd6.tar.gz rails-f8167acc41d514847e07a305262481db6a149dd6.tar.bz2 rails-f8167acc41d514847e07a305262481db6a149dd6.zip | |
Merge pull request #23398 from matthewd/interlock
Address remaining known issues in Interlock
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/application/finisher.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb index 404e3c3e23..411cdbad19 100644 --- a/railties/lib/rails/application/finisher.rb +++ b/railties/lib/rails/application/finisher.rb @@ -86,7 +86,7 @@ module Rails # added in the hook are taken into account. initializer :set_clear_dependencies_hook, group: :all do callback = lambda do - ActiveSupport::Dependencies.interlock.attempt_unloading do + ActiveSupport::Dependencies.interlock.unloading do ActiveSupport::DescendantsTracker.clear ActiveSupport::Dependencies.clear end |