diff options
| -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 |