diff options
| author | Krekoten' Marjan <krekoten@gmail.com> | 2010-10-12 23:44:45 +0300 |
|---|---|---|
| committer | Krekoten' Marjan <krekoten@gmail.com> | 2010-10-12 23:44:45 +0300 |
| commit | 6f4d00c5a58214646ba3fe22fe55b2a257dbf992 (patch) | |
| tree | 46dff794a4ece60c14b02fabf7a1f531bebeb683 | |
| parent | 0744d36f479ad35a89a50efaadb66674cac0a323 (diff) | |
| parent | a0b53b25b6dc422bf29d2879a8f1a53b9983ac77 (diff) | |
| download | rails-6f4d00c5a58214646ba3fe22fe55b2a257dbf992.tar.gz rails-6f4d00c5a58214646ba3fe22fe55b2a257dbf992.tar.bz2 rails-6f4d00c5a58214646ba3fe22fe55b2a257dbf992.zip | |
Merge branch 'master' of github.com:lifo/docrails
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time/conversions.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/time/conversions.rb b/activesupport/lib/active_support/core_ext/time/conversions.rb index 025c619783..d4ae3131ec 100644 --- a/activesupport/lib/active_support/core_ext/time/conversions.rb +++ b/activesupport/lib/active_support/core_ext/time/conversions.rb @@ -19,8 +19,8 @@ class Time # # time = Time.now # => Thu Jan 18 06:10:17 CST 2007 # - # time.to_formatted_s(:time) # => "06:10:17" - # time.to_s(:time) # => "06:10:17" + # time.to_formatted_s(:time) # => "06:10" + # time.to_s(:time) # => "06:10" # # time.to_formatted_s(:db) # => "2007-01-18 06:10:17" # time.to_formatted_s(:number) # => "20070118061017" |