diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2010-03-21 21:09:48 -0300 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-03-21 18:16:18 -0700 |
| commit | 16cad60fd3734740f30ddc770f60da8a5a8deb97 (patch) | |
| tree | a3d85f89219dd4812ca3f45f55758a7289ca5678 | |
| parent | 4884f28c8035f98b6cacd68e6476254f553ae020 (diff) | |
| download | rails-16cad60fd3734740f30ddc770f60da8a5a8deb97.tar.gz rails-16cad60fd3734740f30ddc770f60da8a5a8deb97.tar.bz2 rails-16cad60fd3734740f30ddc770f60da8a5a8deb97.zip | |
avoid active_support/core_ext/time/conversions.rb warnings
[#4250 state:committed]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time/conversions.rb | 1 |
2 files changed, 3 insertions, 0 deletions
@@ -19,6 +19,8 @@ group :test do gem "mysql", ">= 2.8.1" end +gem "system_timer" + # AP gem "rack-test", "0.5.3", :require => 'rack/test' gem "RedCloth", ">= 4.2.2" diff --git a/activesupport/lib/active_support/core_ext/time/conversions.rb b/activesupport/lib/active_support/core_ext/time/conversions.rb index 6d9c080442..86103ebce2 100644 --- a/activesupport/lib/active_support/core_ext/time/conversions.rb +++ b/activesupport/lib/active_support/core_ext/time/conversions.rb @@ -1,4 +1,5 @@ require 'active_support/inflector' +require 'active_support/core_ext/time/publicize_conversion_methods' require 'active_support/values/time_zone' class Time |