diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-22 16:48:58 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-22 16:48:58 -0700 |
| commit | 6fee981fa4ea2654f825c58b58327fc15fddf3a6 (patch) | |
| tree | 1e6f5b94f25e72258cde8aee63fa9f12ba7d476e /activesupport | |
| parent | ab321268f86d9013cbd4ecd0b5f46e7b05ec55a9 (diff) | |
| download | rails-6fee981fa4ea2654f825c58b58327fc15fddf3a6.tar.gz rails-6fee981fa4ea2654f825c58b58327fc15fddf3a6.tar.bz2 rails-6fee981fa4ea2654f825c58b58327fc15fddf3a6.zip | |
Opt in to JSON
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support.rb | 1 | ||||
| -rw-r--r-- | activesupport/test/json/decoding_test.rb | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb index 84bf372163..5392faa993 100644 --- a/activesupport/lib/active_support.rb +++ b/activesupport/lib/active_support.rb @@ -52,6 +52,5 @@ end require 'active_support/vendor' require 'active_support/dependencies' -require 'active_support/json' I18n.load_path << "#{File.dirname(__FILE__)}/active_support/locale/en.yml" diff --git a/activesupport/test/json/decoding_test.rb b/activesupport/test/json/decoding_test.rb index 7d8a07654d..9b4b207c88 100644 --- a/activesupport/test/json/decoding_test.rb +++ b/activesupport/test/json/decoding_test.rb @@ -1,5 +1,6 @@ # encoding: UTF-8 require 'abstract_unit' +require 'active_support/json' class TestJSONDecoding < ActiveSupport::TestCase TESTS = { |