From 0b7c6d58c0423d777bde7b69126e2e10c6745137 Mon Sep 17 00:00:00 2001 From: Godfrey Chan Date: Wed, 6 Nov 2013 18:11:39 -0800 Subject: Move the JSON extension require statements to the right place. In #12203, the JSON core extensions were moved into the `core_ext` folder. Unfortunately, there are some corresponding requires that were left behind. The problem is partially addressed in #12710, this commit fixes the rest. --- activesupport/lib/active_support/json/encoding.rb | 8 -------- 1 file changed, 8 deletions(-) (limited to 'activesupport/lib/active_support/json') diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb index c9840e9faa..0e1c379b5b 100644 --- a/activesupport/lib/active_support/json/encoding.rb +++ b/activesupport/lib/active_support/json/encoding.rb @@ -3,14 +3,6 @@ require 'active_support/core_ext/object/json' require 'active_support/core_ext/module/delegation' -require 'active_support/core_ext/big_decimal/conversions' # for #to_s -require 'active_support/core_ext/hash/except' -require 'active_support/core_ext/hash/slice' -require 'active_support/core_ext/object/instance_variables' -require 'active_support/core_ext/time/conversions' -require 'active_support/core_ext/date_time/conversions' -require 'active_support/core_ext/date/conversions' - module ActiveSupport class << self delegate :use_standard_json_time_format, :use_standard_json_time_format=, -- cgit v1.2.3