TimeZone#to_s uses UTC rather than GMT. References #1689.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8370 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

3 files changed, 4 insertions, 2 deletions

diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index 4a23f775fd..f1dc636f8e 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* TimeZone#to_s uses UTC rather than GMT.  #1689 [Chu Yeow]
+
 * Refactor of Hash#symbolize_keys! to use Hash#replace.  Closes #10420 [ReinH]
 
 * Fix HashWithIndifferentAccess#to_options! so it doesn't clear the options hash.  Closes #10419 [ReinH]
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb
index cd4b84bdc7..b7df68fe33 100644
--- a/activesupport/lib/active_support/values/time_zone.rb
+++ b/activesupport/lib/active_support/values/time_zone.rb
@@ -68,7 +68,7 @@ class TimeZone
 
   # Returns a textual representation of this time zone.
   def to_s
-    "(GMT#{formatted_offset}) #{name}"
+    "(UTC#{formatted_offset}) #{name}"
   end
 
   @@zones = nil
diff --git a/activesupport/test/time_zone_test.rb b/activesupport/test/time_zone_test.rb
index bf41f14741..c2a3e1c532 100644
--- a/activesupport/test/time_zone_test.rb
+++ b/activesupport/test/time_zone_test.rb
@@ -67,7 +67,7 @@ class TimeZoneTest < Test::Unit::TestCase
 
   def test_to_s
     zone = TimeZone.create( "Test", 4200 )
-    assert_equal "(GMT+01:10) Test", zone.to_s
+    assert_equal "(UTC+01:10) Test", zone.to_s
   end
 
   def test_all_sorted