aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/json
diff options
context:
space:
mode:
authorMaxime RETY <maximerety@macbook-de-maxime-rety.local>2010-06-18 12:16:40 +0200
committerJeremy Kemper <jeremy@bitsweat.net>2010-06-18 20:12:31 -0700
commit2c2a5fe8299402f9bce4f163b0fd4187bb8f41a5 (patch)
treee07d3a76d01dfc7abefa958dcc2e198de07eb7fe /activesupport/lib/active_support/json
parenta7cae64104008b124c834b839887bbbbe148219b (diff)
downloadrails-2c2a5fe8299402f9bce4f163b0fd4187bb8f41a5.tar.gz
rails-2c2a5fe8299402f9bce4f163b0fd4187bb8f41a5.tar.bz2
rails-2c2a5fe8299402f9bce4f163b0fd4187bb8f41a5.zip
Fix Yajl backend discovery in ActiveSupport::JSON
[#4897 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'activesupport/lib/active_support/json')
-rw-r--r--activesupport/lib/active_support/json/backends/yajl.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/json/backends/yajl.rb b/activesupport/lib/active_support/json/backends/yajl.rb
index d76f8b03e4..64e50e0d87 100644
--- a/activesupport/lib/active_support/json/backends/yajl.rb
+++ b/activesupport/lib/active_support/json/backends/yajl.rb
@@ -1,4 +1,4 @@
-require 'yajl-ruby' unless defined?(Yajl)
+require 'yajl' unless defined?(Yajl)
module ActiveSupport
module JSON