diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2015-12-04 02:35:14 -0200 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2015-12-04 02:35:14 -0200 |
| commit | 418abd0111dfc9e83307a34a5c945a21ca738a8e (patch) | |
| tree | bfefa3da52d3533a866ebbd033e487f9f5868730 /railties/lib | |
| parent | 215f86c3483cf300b2ccd6d5d8b97f9c9bf547f5 (diff) | |
| parent | a75496b31aaf8de47b21f68d3f68af8c12c1cc94 (diff) | |
| download | rails-418abd0111dfc9e83307a34a5c945a21ca738a8e.tar.gz rails-418abd0111dfc9e83307a34a5c945a21ca738a8e.tar.bz2 rails-418abd0111dfc9e83307a34a5c945a21ca738a8e.zip | |
Merge pull request #22493 from rails/rm-fix-tests
Fix the Railties tests
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 80733c2d90..91ed835bd6 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -182,11 +182,7 @@ module Rails private def file_update_checker - if defined?(Listen) && Listen::Adapter.select() != Listen::Adapter::Polling - ActiveSupport::FileEventedUpdateChecker - else - ActiveSupport::FileUpdateChecker - end + ActiveSupport::FileUpdateChecker end class Custom #:nodoc: |