aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/values
diff options
context:
space:
mode:
authorGeoff Buesing <gbuesing@gmail.com>2008-01-25 03:54:10 +0000
committerGeoff Buesing <gbuesing@gmail.com>2008-01-25 03:54:10 +0000
commit2168178bdbb14f1b8a97f22a3eb78dd533c9cb34 (patch)
tree1f1b94fc6a428b2e3c9b585df45964047616a663 /activesupport/lib/active_support/values
parent8f7232bc76cba944ecb7769bb3dab633ed15c3a6 (diff)
downloadrails-2168178bdbb14f1b8a97f22a3eb78dd533c9cb34.tar.gz
rails-2168178bdbb14f1b8a97f22a3eb78dd533c9cb34.tar.bz2
rails-2168178bdbb14f1b8a97f22a3eb78dd533c9cb34.zip
TimeZone#to_s uses UTC rather than GMT; reapplying change that was undone in [8679]. References #1689
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8716 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib/active_support/values')
-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 7adc8133c6..259b49a50a 100644
--- a/activesupport/lib/active_support/values/time_zone.rb
+++ b/activesupport/lib/active_support/values/time_zone.rb
@@ -171,7 +171,7 @@ class TimeZone
# Returns a textual representation of this time zone.
def to_s
- "(GMT#{formatted_offset}) #{name}"
+ "(UTC#{formatted_offset}) #{name}"
end
begin # the following methods depend on the tzinfo gem