kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

fixed broken build after multi_json upgrade

Browse source 
Multi_json also upgraded.
This commit is contained in:
Arun Agrawal 2012-04-16 19:10:04 +05:30
parent 039a118857
commit 57baa0e97a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activesupport/activesupport.gemspec
View file

@ -19,6 +19,6 @@ Gem::Specification.new do |s|
s.rdoc_options.concat ['--encoding', 'UTF-8'] s.rdoc_options.concat ['--encoding', 'UTF-8']
s.add_dependency('i18n', '~> 0.6') 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') s.add_dependency('tzinfo', '~> 0.3.31')
end end

6
activesupport/lib/active_support/json/decoding.rb
View file

@ -9,7 +9,7 @@ module ActiveSupport
module JSON module JSON
class << self class << self
def decode(json, options ={}) def decode(json, options ={})
data = MultiJson.decode(json, options) data = MultiJson.load(json, options)
if ActiveSupport.parse_json_times if ActiveSupport.parse_json_times
convert_dates_from(data) convert_dates_from(data)
else else
@ -18,12 +18,12 @@ module ActiveSupport
end end
def engine def engine
MultiJson.engine MultiJson.adapter
end end
alias :backend :engine alias :backend :engine
def engine=(name) def engine=(name)
MultiJson.engine = name MultiJson.use(name)
end end
alias :backend= :engine= alias :backend= :engine=