Permalink
Browse files

Merge branch 'master' into cherry

Conflicts:
	activesupport/lib/active_support.rb
  • Loading branch information...
2 parents f5d720f + 6fee981 commit 7f6779c1d5e4ec7f642839caa7e86320720f77c8 @jeremy jeremy committed Apr 22, 2009
@@ -1,3 +1,5 @@
+require 'active_support/json'
+
module ActionDispatch
class ParamsParser
ActionController::Base.param_parsers[Mime::XML] = :xml_simple
@@ -1,3 +1,5 @@
+require 'active_support/json'
+
module ActiveRecord #:nodoc:
module Serialization
def self.included(base)
@@ -1,3 +1,5 @@
+require 'active_support/json'
+
module ActiveResource
module Formats
module JsonFormat
@@ -51,6 +51,5 @@ def self.load_all!
end
require 'active_support/vendor'
-require 'active_support/json'
I18n.load_path << "#{File.dirname(__FILE__)}/active_support/locale/en.yml"
@@ -1,5 +1,6 @@
# encoding: UTF-8
require 'abstract_unit'
+require 'active_support/json'
class TestJSONDecoding < ActiveSupport::TestCase
TESTS = {

0 comments on commit 7f6779c

Please sign in to comment.