diff options
| author | Matthew Draper <matthew@trebex.net> | 2015-06-12 02:07:53 +0930 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2015-06-12 02:13:54 +0930 |
| commit | 23613a4cbf5f4761cab4097eda0b205d73841d86 (patch) | |
| tree | dce65f60eaa943fa18ecef0c9426c3c31ee1e431 /activerecord/lib | |
| parent | b560f8774a57e9f0c97cc369ccd7491463f0d663 (diff) | |
| download | rails-23613a4cbf5f4761cab4097eda0b205d73841d86.tar.gz rails-23613a4cbf5f4761cab4097eda0b205d73841d86.tar.bz2 rails-23613a4cbf5f4761cab4097eda0b205d73841d86.zip | |
Merge pull request #20516 from kares/patch-2
change AR clear order in ActionDisplatch::Reloader hook
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/railtie.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index 5af64b717a..da6b8447d3 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -156,8 +156,8 @@ end_warning ActiveSupport.on_load(:active_record) do ActionDispatch::Reloader.send(hook) do if ActiveRecord::Base.connected? - ActiveRecord::Base.clear_reloadable_connections! ActiveRecord::Base.clear_cache! + ActiveRecord::Base.clear_reloadable_connections! end end end |