aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2010-07-02 23:46:19 -0300
committerJeremy Kemper <jeremy@bitsweat.net>2010-07-02 20:22:35 -0700
commit8cc746331c32a6951e5c73c8a21fd32f00680471 (patch)
treeaa5ec863bd99c3ba9134794eb7d516e870ef9aa5 /activesupport
parent227e1caea51279fe4687f17e5704d637a21ea15f (diff)
downloadrails-8cc746331c32a6951e5c73c8a21fd32f00680471.tar.gz
rails-8cc746331c32a6951e5c73c8a21fd32f00680471.tar.bz2
rails-8cc746331c32a6951e5c73c8a21fd32f00680471.zip
Time#formatted_offset is defined in core_ext/time/conversions
[#4979]
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/json/encoding.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb
index 8ec3af3f50..315897b423 100644
--- a/activesupport/lib/active_support/json/encoding.rb
+++ b/activesupport/lib/active_support/json/encoding.rb
@@ -10,6 +10,7 @@ require 'active_support/core_ext/hash/except'
require 'active_support/core_ext/hash/slice'
require 'active_support/core_ext/object/instance_variables'
require 'time'
+require 'active_support/core_ext/time/conversions'
module ActiveSupport
class << self