diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2014-06-18 00:37:46 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2014-06-18 00:37:46 -0500 |
| commit | bc90ea63e9937d2eee3da7dce022bf4bed10e49a (patch) | |
| tree | 6a6ef0ce16a71ff12ad7289d3c72cf0cc24d62df /activesupport/lib/active_support | |
| parent | 6d800a909e24465ca6f3fa5206222fa7d78967f6 (diff) | |
| download | rails-bc90ea63e9937d2eee3da7dce022bf4bed10e49a.tar.gz rails-bc90ea63e9937d2eee3da7dce022bf4bed10e49a.tar.bz2 rails-bc90ea63e9937d2eee3da7dce022bf4bed10e49a.zip | |
Revert "Merge pull request #15794 from vishalzambre/patch-1"
This reverts commit 6d800a909e24465ca6f3fa5206222fa7d78967f6, reversing
changes made to 6a051299f98ee43864326c6c0a4f7d169d22b3f8.
We don't apply non-security fixes to 3-2-stable branch!!!
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/file_update_checker.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/file_update_checker.rb b/activesupport/lib/active_support/file_update_checker.rb index 2e0e873fda..a4ad2da137 100644 --- a/activesupport/lib/active_support/file_update_checker.rb +++ b/activesupport/lib/active_support/file_update_checker.rb @@ -95,7 +95,7 @@ module ActiveSupport def updated_at #:nodoc: @updated_at || begin all = [] - all.concat @files.select { |f| File.exist?(f) } + all.concat @files.select { |f| File.exists?(f) } all.concat Dir[@glob] if @glob all.map { |path| File.mtime(path) }.max || Time.at(0) end |