@@ -1,5 +1,7 @@ *Edge* +* Update Edinburgh TimeZone to use "Europe/London" instead of "Europe/Dublin" #3310 [Phil Ross] + * Update bundled TZInfo to v0.3.15 [Geoff Buesing] * JSON: +Object#to_json+ calls +as_json+ to coerce itself into something natively encodable like +Hash+, +Integer+, or +String+. Override +as_json+ instead of +to_json+ so you're JSON library agnostic. [Jeremy Kemper] activesupport/CHANGELOG @@ -63,7 +63,7 @@ module ActiveSupport "Azores" => "Atlantic/Azores", "Cape Verde Is." => "Atlantic/Cape_Verde", "Dublin" => "Europe/Dublin", - "Edinburgh" => "Europe/Dublin", + "Edinburgh" => "Europe/London", "Lisbon" => "Europe/Lisbon", "London" => "Europe/London", "Casablanca" => "Africa/Casablanca", activesupport/lib/active_support/values/time_zone.rb 057f0d3c16d533aea1a98ea3d7f4c2a09274e5c4 Phil Ross phil.ross@gmail.com http://github.com/samgranieri/rails/commit/9b67b7ba2f74067235c8bd8f9dc02fb6337eda52 9b67b7ba2f74067235c8bd8f9dc02fb6337eda52 2009-10-27T19:13:13-07:00 2009-10-01T14:09:12-07:00 Edinburgh TimeZone references "Europe/London" instead of "Europe/Dublin" [#3310 state:resolved] 5f553c6ad8ef6dfbfcfcce4171241b660ca7cc44 Geoff Buesing gbuesing@gmail.com