diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2015-10-04 08:02:23 -0600 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-10-04 08:02:23 -0600 |
| commit | df9faf53e9cfddd1be9a09811eed1192a3073afc (patch) | |
| tree | 5eaaa650d4a82228859c8ff60089dea00ad6af85 /activesupport | |
| parent | eee2aa31a6d0f56173f4b77fde0525bd6bdee1e5 (diff) | |
| parent | 73aa47e67349397bb3f64bd2df66cb690dd041d4 (diff) | |
| download | rails-df9faf53e9cfddd1be9a09811eed1192a3073afc.tar.gz rails-df9faf53e9cfddd1be9a09811eed1192a3073afc.tar.bz2 rails-df9faf53e9cfddd1be9a09811eed1192a3073afc.zip | |
Merge pull request #21866 from tanmay3011/fix_documentation
Fix Time.now format in documentation [ci skip]
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time/conversions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/time/conversions.rb b/activesupport/lib/active_support/core_ext/time/conversions.rb index 24d13937f6..eecbac2c20 100644 --- a/activesupport/lib/active_support/core_ext/time/conversions.rb +++ b/activesupport/lib/active_support/core_ext/time/conversions.rb @@ -24,7 +24,7 @@ class Time # # This method is aliased to <tt>to_s</tt>. # - # time = Time.now # => Thu Jan 18 06:10:17 CST 2007 + # time = Time.now # => 2007-01-18 06:10:17 -06:00 # # time.to_formatted_s(:time) # => "06:10" # time.to_s(:time) # => "06:10" |