github-migration
/
engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new multi_json gem

This commit is contained in:
did 2012-05-05 02:39:23 -07:00
parent 03d13d92d0
commit a939629cbf
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Gemfile.lock
View File

@ -30,7 +30,6 @@ PATH
custom_fields (~> 2.0.0.rc10)
devise (~> 1.5.3)
dragonfly (~> 0.9.8)
execjs (= 1.3.0)
flash_cookie_session (~> 1.1.1)
fog (~> 1.3.1)
formtastic (~> 2.0.2)
@ -46,7 +45,7 @@ PATH
mimetype-fu (~> 0.1.2)
mongo (~> 1.5.2)
mongoid (~> 2.4.9)
multi_json (= 1.2.0)
multi_json (= 1.3.4)
rack-cache (~> 1.1)
rails (~> 3.2.3)
rails-backbone (~> 0.6.1)
@ -150,7 +149,7 @@ GEM
ejs (1.0.0)
erubis (2.7.0)
excon (0.13.4)
execjs (1.3.0)
execjs (1.3.1)
multi_json (~> 1.0)
factory_girl (2.5.2)
activesupport (>= 2.3.9)
@ -220,7 +219,7 @@ GEM
activemodel (~> 3.1)
mongo (~> 1.3)
tzinfo (~> 0.3.22)
multi_json (1.2.0)
multi_json (1.3.4)
multi_xml (0.4.4)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
@ -284,7 +283,7 @@ GEM
rubyzip (0.9.8)
sanitize (2.0.3)
nokogiri (>= 1.4.4, < 1.6)
sass (3.1.16)
sass (3.1.17)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)

3
locomotive_cms.gemspec
View File

@ -59,8 +59,7 @@ Gem::Specification.new do |s|
s.add_dependency 'rack-cache', '~> 1.1'
s.add_dependency 'mimetype-fu', '~> 0.1.2'
s.add_dependency 'execjs', '1.3.0'
s.add_dependency 'multi_json', '1.2.0'
s.add_dependency 'multi_json', '1.3.4'
s.add_dependency 'httparty', '~> 0.8.1'
s.add_dependency 'actionmailer-with-request', '~> 0.3.0'