diff options
| author | Matthew Draper <matthew@trebex.net> | 2017-11-15 21:31:09 +1030 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-15 21:31:09 +1030 |
| commit | 706b4bee89655bc02cc3a7ef1a6890fe7c868dec (patch) | |
| tree | 91d6decad5987ea9af970ddbfb581eb3bfea76e3 /activesupport/lib/active_support | |
| parent | 23c41e4657a507c574e555339821f545c819e602 (diff) | |
| parent | 134ffd290adfdbfb6c291115f5d7fb297314002c (diff) | |
| download | rails-706b4bee89655bc02cc3a7ef1a6890fe7c868dec.tar.gz rails-706b4bee89655bc02cc3a7ef1a6890fe7c868dec.tar.bz2 rails-706b4bee89655bc02cc3a7ef1a6890fe7c868dec.zip | |
Merge pull request #29776 from mrj/fix-idlw-timezone
Fix the "International Date Line West" timezone
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/values/time_zone.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb index 4d1fbd4453..d1a2003013 100644 --- a/activesupport/lib/active_support/values/time_zone.rb +++ b/activesupport/lib/active_support/values/time_zone.rb @@ -30,7 +30,7 @@ module ActiveSupport class TimeZone # Keys are Rails TimeZone names, values are TZInfo identifiers. MAPPING = { - "International Date Line West" => "Pacific/Midway", + "International Date Line West" => "Etc/GMT+12", "Midway Island" => "Pacific/Midway", "American Samoa" => "Pacific/Pago_Pago", "Hawaii" => "Pacific/Honolulu", |