diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2015-10-20 14:20:32 -0600 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-10-20 14:20:32 -0600 |
| commit | 8b64aba17bbb7bc6af6f0aafb874904147f373bf (patch) | |
| tree | 046a807b6ad660e25424d8dbf608e834e86be6db /activesupport/lib | |
| parent | cbcdecd2c55fca9613722779231de2d8dd67ad02 (diff) | |
| parent | 86d2924a115c2604e4facdf285a7b764938fae0f (diff) | |
| download | rails-8b64aba17bbb7bc6af6f0aafb874904147f373bf.tar.gz rails-8b64aba17bbb7bc6af6f0aafb874904147f373bf.tar.bz2 rails-8b64aba17bbb7bc6af6f0aafb874904147f373bf.zip | |
Merge pull request #21883 from tarzan/cache-key-too-precise
Fix precision on cache_key
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 eecbac2c20..536c4bf525 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 :db => '%Y-%m-%d %H:%M:%S', :number => '%Y%m%d%H%M%S', :nsec => '%Y%m%d%H%M%S%9N', + :usec => '%Y%m%d%H%M%S%6N', :time => '%H:%M', :short => '%d %b %H:%M', :long => '%B %d, %Y %H:%M', |