diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2012-05-18 17:30:35 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-10 15:33:01 -0300 |
| commit | 09a8b146ef9e038d6036a21fb4f80e15f9ee969a (patch) | |
| tree | 4d9ccc8225360b8df1dc15e2e696dbc636e20330 /activesupport/lib/active_support/core_ext/time/conversions.rb | |
| parent | cc9958026409d7a4b76af555c0240db4428a071b (diff) | |
| download | rails-09a8b146ef9e038d6036a21fb4f80e15f9ee969a.tar.gz rails-09a8b146ef9e038d6036a21fb4f80e15f9ee969a.tar.bz2 rails-09a8b146ef9e038d6036a21fb4f80e15f9ee969a.zip | |
Merge pull request #6376 from jgaskins/timestamp-microseconds
Increase numeric-timestamp precision to nanoseconds
Conflicts:
activesupport/lib/active_support/core_ext/time/conversions.rb
Diffstat (limited to 'activesupport/lib/active_support/core_ext/time/conversions.rb')
| -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 49ac18d245..cb175e8751 100644 --- a/activesupport/lib/active_support/core_ext/time/conversions.rb +++ b/activesupport/lib/active_support/core_ext/time/conversions.rb @@ -6,6 +6,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", |