aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-11-24 13:08:25 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2008-11-24 13:08:25 -0800
commit536c239966da020777c501d8a2fa7f026fb3a451 (patch)
tree2f61c31809cc4592efa5afa93026b66a87c9500d
parent565fad350ebef6d42c567fb9ba57477f76dad1a9 (diff)
downloadrails-536c239966da020777c501d8a2fa7f026fb3a451.tar.gz
rails-536c239966da020777c501d8a2fa7f026fb3a451.tar.bz2
rails-536c239966da020777c501d8a2fa7f026fb3a451.zip
JSON can't be autoloaded since it includes core extensions
-rw-r--r--activesupport/lib/active_support.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index 8068538e33..e64771033c 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -37,7 +37,6 @@ module ActiveSupport
autoload :Duration, 'active_support/duration'
autoload :Gzip, 'active_support/gzip'
autoload :Inflector, 'active_support/inflector'
- autoload :JSON, 'active_support/json'
autoload :Memoizable, 'active_support/memoizable'
autoload :MessageVerifier, 'active_support/message_verifier'
autoload :Multibyte, 'active_support/multibyte'
@@ -53,6 +52,7 @@ end
require 'active_support/vendor'
require 'active_support/core_ext'
+require 'active_support/json'
I18n.load_path << "#{File.dirname(__FILE__)}/active_support/locale/en.yml"