Merge pull request rails#47 from fcheung/master

Use multijson for serialization
bigjason · Aug 8, 2012 · 38396ad · 38396ad
2 parents e2a6616 + a58b355
commit 38396ad
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/jbuilder.rb b/lib/jbuilder.rb
@@ -3,7 +3,7 @@
 require 'active_support/core_ext/array/access'
 require 'active_support/core_ext/enumerable'
 require 'active_support/json'
-
+require 'multi_json'
 class Jbuilder < BlankSlate
   # Yields a builder and automatically turns the result into a JSON string
   def self.encode
@@ -131,7 +131,7 @@ def attributes!
 
   # Encodes the current builder as JSON.
   def target!
-    ActiveSupport::JSON.encode @attributes
+    MultiJson.encode @attributes
   end