Skip to content
Browse files

Merge pull request #5753 from carlosantoniodasilva/as-remove-require-…

…and-warnings

Remove circular require from AS Deprecation, and fix warnings
  • Loading branch information...
2 parents 163258b + b621ded commit ca879d203be8dff52f7d41e3b08d668935304223 @josevalim josevalim committed Apr 5, 2012
View
1 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'
View
3 activesupport/lib/active_support/file_update_checker.rb
@@ -54,6 +54,9 @@ def initialize(files, dirs={}, &block)
@glob = compile_glob(dirs)
@block = block
+ @watched = nil
+ @updated_at = nil
+
@last_watched = watched
@last_update_at = updated_at(@last_watched)
end

0 comments on commit ca879d2

Please sign in to comment.
Something went wrong with that request. Please try again.