diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-03-02 02:56:53 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-03-02 02:56:53 +1030 |
| commit | 541e4abb4b3710a384aefac83cafd0ab878c60bf (patch) | |
| tree | 55603da9b6f9407a24c68e1d1fd53e109c4131e7 /activesupport/lib/active_support/i18n_railtie.rb | |
| parent | ecdc0fbc872ea734adf29b3f9f3463b916235286 (diff) | |
| parent | 60b53e9883bfd9f4edb640dbe2de89227b875e09 (diff) | |
| download | rails-541e4abb4b3710a384aefac83cafd0ab878c60bf.tar.gz rails-541e4abb4b3710a384aefac83cafd0ab878c60bf.tar.bz2 rails-541e4abb4b3710a384aefac83cafd0ab878c60bf.zip | |
Merge pull request #23807 from matthewd/executor
Publish AS::Executor and AS::Reloader APIs
Diffstat (limited to 'activesupport/lib/active_support/i18n_railtie.rb')
| -rw-r--r-- | activesupport/lib/active_support/i18n_railtie.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/i18n_railtie.rb b/activesupport/lib/active_support/i18n_railtie.rb index 82aacf3b24..6cc7c90c12 100644 --- a/activesupport/lib/active_support/i18n_railtie.rb +++ b/activesupport/lib/active_support/i18n_railtie.rb @@ -64,8 +64,8 @@ module I18n end app.reloaders << reloader - ActionDispatch::Reloader.to_prepare do - reloader.execute_if_updated + app.reloader.to_run do + reloader.execute_if_updated { require_unload_lock! } # TODO: remove the following line as soon as the return value of # callbacks is ignored, that is, returning `false` does not # display a deprecation warning or halts the callback chain. |