diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2012-04-16 06:48:01 -0700 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2012-04-16 06:48:01 -0700 |
| commit | fd12fe65044b504554a36ae886f336d3ec554fe8 (patch) | |
| tree | e8b400fb694e8010c1bf0b1c519b874800944b67 /activesupport | |
| parent | 039a118857975fa4495a3728d97c65c5d91a8a87 (diff) | |
| parent | 57baa0e97aa4b444706007fe5b9e9ecb5e462df5 (diff) | |
| download | rails-fd12fe65044b504554a36ae886f336d3ec554fe8.tar.gz rails-fd12fe65044b504554a36ae886f336d3ec554fe8.tar.bz2 rails-fd12fe65044b504554a36ae886f336d3ec554fe8.zip | |
Merge pull request #5860 from arunagw/multi_json_upgrade_fix
fixed broken build after multi_json upgrade
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/activesupport.gemspec | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/json/decoding.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec index d26d71b615..4228a24d5e 100644 --- a/activesupport/activesupport.gemspec +++ b/activesupport/activesupport.gemspec @@ -19,6 +19,6 @@ Gem::Specification.new do |s| s.rdoc_options.concat ['--encoding', 'UTF-8'] s.add_dependency('i18n', '~> 0.6') - s.add_dependency('multi_json', '~> 1.0') + s.add_dependency('multi_json', '~> 1.3.0') s.add_dependency('tzinfo', '~> 0.3.31') end diff --git a/activesupport/lib/active_support/json/decoding.rb b/activesupport/lib/active_support/json/decoding.rb index cbeb6c0a28..986a764479 100644 --- a/activesupport/lib/active_support/json/decoding.rb +++ b/activesupport/lib/active_support/json/decoding.rb @@ -9,7 +9,7 @@ module ActiveSupport module JSON class << self def decode(json, options ={}) - data = MultiJson.decode(json, options) + data = MultiJson.load(json, options) if ActiveSupport.parse_json_times convert_dates_from(data) else @@ -18,12 +18,12 @@ module ActiveSupport end def engine - MultiJson.engine + MultiJson.adapter end alias :backend :engine def engine=(name) - MultiJson.engine = name + MultiJson.use(name) end alias :backend= :engine= |