aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-04-17 22:24:08 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-04-17 22:24:08 -0700
commitf40eb52566b27184623dcac5cca8d6831a8e5de5 (patch)
tree3b868a0701d0fc56b5f6c19d1bad9fcf2ea638e4
parent2c5c2717cb7b4116bbc4f91649e82b20cfb8a99e (diff)
downloadrails-f40eb52566b27184623dcac5cca8d6831a8e5de5.tar.gz
rails-f40eb52566b27184623dcac5cca8d6831a8e5de5.tar.bz2
rails-f40eb52566b27184623dcac5cca8d6831a8e5de5.zip
Autoload YAML and StringScanner for JSON decoding
-rw-r--r--activesupport/lib/active_support/json/decoding.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/json/decoding.rb b/activesupport/lib/active_support/json/decoding.rb
index b0a9d935ba..c66500aa9c 100644
--- a/activesupport/lib/active_support/json/decoding.rb
+++ b/activesupport/lib/active_support/json/decoding.rb
@@ -1,5 +1,5 @@
-require 'yaml'
-require 'strscan'
+autoload :YAML, 'yaml' unless defined? YAML
+autoload :StringScanner, 'strscan' unless defined? StringScanner
require 'active_support/core_ext/string/starts_ends_with'