diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2012-05-18 17:30:35 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2012-05-18 17:30:35 -0700 |
| commit | 98657ad10c0bd799b8b314b9af3f0495267b2ddb (patch) | |
| tree | 23065a3f15c2eec758db07ac7746a1bec993caee /activesupport/lib | |
| parent | 49b72fa864364b081770c52d1b0847eac00b2be2 (diff) | |
| parent | 900dbc54f17500e14e481eab2ebf88acfc5448aa (diff) | |
| download | rails-98657ad10c0bd799b8b314b9af3f0495267b2ddb.tar.gz rails-98657ad10c0bd799b8b314b9af3f0495267b2ddb.tar.bz2 rails-98657ad10c0bd799b8b314b9af3f0495267b2ddb.zip | |
Merge pull request #6376 from jgaskins/timestamp-microseconds
Increase numeric-timestamp precision to nanoseconds
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time/conversions.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/time/conversions.rb b/activesupport/lib/active_support/core_ext/time/conversions.rb index 4f852fd780..10ca26acf2 100644 --- a/activesupport/lib/active_support/core_ext/time/conversions.rb +++ b/activesupport/lib/active_support/core_ext/time/conversions.rb @@ -5,6 +5,7 @@ class Time DATE_FORMATS = { :db => '%Y-%m-%d %H:%M:%S', :number => '%Y%m%d%H%M%S', + :nsec => '%Y%m%d%H%M%S%9N', :time => '%H:%M', :short => '%d %b %H:%M', :long => '%B %d, %Y %H:%M', |