diff options
| author | José Valim <jose.valim@gmail.com> | 2012-04-05 10:54:51 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-04-05 10:54:51 -0700 |
| commit | ca879d203be8dff52f7d41e3b08d668935304223 (patch) | |
| tree | adf828d6c0c9ff069cec98502c08b8f3f323721b /activesupport | |
| parent | 163258ba2a7ff325cb79d70a1ad15aeb3d270e28 (diff) | |
| parent | b621ded8130a98c6089a6be9bdeec5865b51fe38 (diff) | |
| download | rails-ca879d203be8dff52f7d41e3b08d668935304223.tar.gz rails-ca879d203be8dff52f7d41e3b08d668935304223.tar.bz2 rails-ca879d203be8dff52f7d41e3b08d668935304223.zip | |
Merge pull request #5753 from carlosantoniodasilva/as-remove-require-and-warnings
Remove circular require from AS Deprecation, and fix warnings
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/deprecation/method_wrappers.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/file_update_checker.rb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/deprecation/method_wrappers.rb b/activesupport/lib/active_support/deprecation/method_wrappers.rb index d0d8b577b3..8be8665e40 100644 --- a/activesupport/lib/active_support/deprecation/method_wrappers.rb +++ b/activesupport/lib/active_support/deprecation/method_wrappers.rb @@ -1,4 +1,3 @@ -require 'active_support/core_ext/module/deprecation' require 'active_support/core_ext/module/aliasing' require 'active_support/core_ext/array/extract_options' diff --git a/activesupport/lib/active_support/file_update_checker.rb b/activesupport/lib/active_support/file_update_checker.rb index c99da22cd6..8860636168 100644 --- a/activesupport/lib/active_support/file_update_checker.rb +++ b/activesupport/lib/active_support/file_update_checker.rb @@ -54,6 +54,9 @@ module ActiveSupport @glob = compile_glob(dirs) @block = block + @watched = nil + @updated_at = nil + @last_watched = watched @last_update_at = updated_at(@last_watched) end |