diff options
author | Andrew White <andyw@pixeltrix.co.uk> | 2013-03-13 04:45:47 +0000 |
---|---|---|
committer | Andrew White <andyw@pixeltrix.co.uk> | 2013-03-13 05:40:25 +0000 |
commit | ba910d76509158d531c637c4ab777beb8b20e53d (patch) | |
tree | 28deec6696e38e1e341e3eea903cac5b4732182c /activesupport/CHANGELOG.md | |
parent | a0c3c1e1f796c215685e4e4bcd3e8c9178936492 (diff) | |
download | rails-ba910d76509158d531c637c4ab777beb8b20e53d.tar.gz rails-ba910d76509158d531c637c4ab777beb8b20e53d.tar.bz2 rails-ba910d76509158d531c637c4ab777beb8b20e53d.zip |
Fix `ActiveSupport::TimeZone.parse` when time is a local DST jump
The previous implementation `ActiveSupport::TimeZone.parse` used `Time.parse`
which applies the system time DST rules to the parsed time. Instead we now
use `Time.utc` and manually apply the offset.
Backport tests from:
005d910624bbfa724b638426a000c8074d4201a2
c89b6c4cdce7ee55ed3665c099d914222fe0344a
03becb13099c439f6aea5058546bc8b0b19b8db8
Fixes #9678.
Diffstat (limited to 'activesupport/CHANGELOG.md')
-rw-r--r-- | activesupport/CHANGELOG.md | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 528de79cf6..bade1ea4e2 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,6 +1,9 @@ ## unreleased ## -* No changes. +* Fix `ActiveSupport::TimeZone.parse` when time is at a local DST jump. + Fixes #9678. + + *Andrew White* ## Rails 3.2.13.rc1 (Feb 17, 2013) ## |