diff options
| author | Abdelkader Boudih <terminale@gmail.com> | 2015-09-26 12:49:28 +0100 |
|---|---|---|
| committer | Abdelkader Boudih <terminale@gmail.com> | 2015-09-26 12:49:28 +0100 |
| commit | e12944fb275eb5e4266c30f20d55e4ef714eae2b (patch) | |
| tree | 769b22cecee0b37b8f03c065c95d72b1876ac580 | |
| parent | 33f1a4ea693120fed248ee6e1164983e65810fd1 (diff) | |
| parent | b612bc9cfacdeff2b66ab929ee9a2572f2e0285f (diff) | |
| download | rails-e12944fb275eb5e4266c30f20d55e4ef714eae2b.tar.gz rails-e12944fb275eb5e4266c30f20d55e4ef714eae2b.tar.bz2 rails-e12944fb275eb5e4266c30f20d55e4ef714eae2b.zip | |
Merge pull request #21777 from aditya-kapoor/minor-time-fix
minor typo fix [ci skip]
| -rw-r--r-- | activesupport/lib/active_support/time_with_zone.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb index eb26eb5ee5..a82a7dfea0 100644 --- a/activesupport/lib/active_support/time_with_zone.rb +++ b/activesupport/lib/active_support/time_with_zone.rb @@ -14,7 +14,7 @@ module ActiveSupport # Time.zone = 'Eastern Time (US & Canada)' # => 'Eastern Time (US & Canada)' # Time.zone.local(2007, 2, 10, 15, 30, 45) # => Sat, 10 Feb 2007 15:30:45 EST -05:00 # Time.zone.parse('2007-02-10 15:30:45') # => Sat, 10 Feb 2007 15:30:45 EST -05:00 - # Time.zone.at(1170361845) # => Sat, 10 Feb 2007 15:30:45 EST -05:00 + # Time.zone.at(1171139445) # => Sat, 10 Feb 2007 15:30:45 EST -05:00 # Time.zone.now # => Sun, 18 May 2008 13:07:55 EDT -04:00 # Time.utc(2007, 2, 10, 20, 30, 45).in_time_zone # => Sat, 10 Feb 2007 15:30:45 EST -05:00 # |