diff options
| author | Richard Schneeman <richard.schneeman@gmail.com> | 2015-09-08 11:46:42 -0500 |
|---|---|---|
| committer | Richard Schneeman <richard.schneeman@gmail.com> | 2015-09-08 11:46:42 -0500 |
| commit | 0c66326124a7dbc8372219e6472fa9a0b48c9ebc (patch) | |
| tree | 288ed77b9e7190756f547244980695a3584ec3a7 | |
| parent | ff83868b10001af74c6f258e878bb29be6425c8d (diff) | |
| parent | 8aa476869d7180277f31f325cc09059a718f9640 (diff) | |
| download | rails-0c66326124a7dbc8372219e6472fa9a0b48c9ebc.tar.gz rails-0c66326124a7dbc8372219e6472fa9a0b48c9ebc.tar.bz2 rails-0c66326124a7dbc8372219e6472fa9a0b48c9ebc.zip | |
Merge pull request #21552 from ronakjangir47/fixed_docs
Fixed Time conversion example for UTC time zone [ci skip]
| -rw-r--r-- | activesupport/lib/active_support/core_ext/string/conversions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/string/conversions.rb b/activesupport/lib/active_support/core_ext/string/conversions.rb index 3e0cb8a7ac..fd79a40e31 100644 --- a/activesupport/lib/active_support/core_ext/string/conversions.rb +++ b/activesupport/lib/active_support/core_ext/string/conversions.rb @@ -14,7 +14,7 @@ class String # "06:12".to_time # => 2012-12-13 06:12:00 +0100 # "2012-12-13 06:12".to_time # => 2012-12-13 06:12:00 +0100 # "2012-12-13T06:12".to_time # => 2012-12-13 06:12:00 +0100 - # "2012-12-13T06:12".to_time(:utc) # => 2012-12-13 05:12:00 UTC + # "2012-12-13T06:12".to_time(:utc) # => 2012-12-13 06:12:00 UTC # "12/13/2012".to_time # => ArgumentError: argument out of range def to_time(form = :local) parts = Date._parse(self, false) |