aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafael.franca@plataformatec.com.br>2012-01-04 14:16:48 -0300
committerRafael Mendonça França <rafael.franca@plataformatec.com.br>2012-01-04 14:16:48 -0300
commitb65bdb1527dbf42d94e5722f6764cebac73d103c (patch)
treeaf30c6efc65243610e8890816124299b9c75b406
parent25c76ec8e2e17cc3eb42a824c38f78fb9e23e70a (diff)
downloadrails-b65bdb1527dbf42d94e5722f6764cebac73d103c.tar.gz
rails-b65bdb1527dbf42d94e5722f6764cebac73d103c.tar.bz2
rails-b65bdb1527dbf42d94e5722f6764cebac73d103c.zip
No need to override to_yaml method in ActiveSupport::TimeWithZone
-rw-r--r--activesupport/lib/active_support/time_with_zone.rb8
1 files changed, 1 insertions, 7 deletions
diff --git a/activesupport/lib/active_support/time_with_zone.rb b/activesupport/lib/active_support/time_with_zone.rb
index 50fe58a006..1cb71012ef 100644
--- a/activesupport/lib/active_support/time_with_zone.rb
+++ b/activesupport/lib/active_support/time_with_zone.rb
@@ -1,4 +1,4 @@
-require "active_support/values/time_zone"
+require 'active_support/values/time_zone'
require 'active_support/core_ext/object/acts_like'
require 'active_support/core_ext/object/inclusion'
@@ -146,12 +146,6 @@ module ActiveSupport
end
end
- def to_yaml(options = {})
- return super if !YAML::ENGINE.syck?
-
- utc.to_yaml(options)
- end
-
def httpdate
utc.httpdate
end