aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark James <mrj@advancedcontrols.com.au>2017-07-13 14:15:52 +1000
committerMark James <mrj@advancedcontrols.com.au>2017-07-13 14:15:52 +1000
commit134ffd290adfdbfb6c291115f5d7fb297314002c (patch)
tree9c80515c7d0c0a53140098cd7754461da926c28b
parent58f10a31b37e9bb6e975a71aa63744f318ee043d (diff)
downloadrails-134ffd290adfdbfb6c291115f5d7fb297314002c.tar.gz
rails-134ffd290adfdbfb6c291115f5d7fb297314002c.tar.bz2
rails-134ffd290adfdbfb6c291115f5d7fb297314002c.zip
Change the "International Date Line West" TZInfo timezone from "Pacific/Midway" (-11) to "Etc/GMT+12" (-12).
-rw-r--r--activesupport/lib/active_support/values/time_zone.rb2
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 c871f11422..a5a88617bd 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",