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

force version of the multi_json gem (1.2.0)

This commit is contained in:
Didier Lafforgue 2012-04-16 20:50:07 +02:00
parent 3eb521ba75
commit 26662acae9
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Gemfile.lock
View File

@ -55,6 +55,7 @@ PATH
mimetype-fu (~> 0.1.2) mimetype-fu (~> 0.1.2)
mongo (~> 1.5.2) mongo (~> 1.5.2)
mongoid (~> 2.4.6) mongoid (~> 2.4.6)
multi_json (= 1.2.0)
rack-cache (~> 1.1) rack-cache (~> 1.1)
rails (~> 3.2.3) rails (~> 3.2.3)
rails-backbone (~> 0.6.1) rails-backbone (~> 0.6.1)
@ -221,8 +222,8 @@ GEM
activemodel (~> 3.1) activemodel (~> 3.1)
mongo (~> 1.3) mongo (~> 1.3)
tzinfo (~> 0.3.22) tzinfo (~> 0.3.22)
multi_json (1.3.0) multi_json (1.2.0)
multi_xml (0.4.3) multi_xml (0.4.4)
net-scp (1.0.4) net-scp (1.0.4)
net-ssh (>= 1.99.1) net-ssh (>= 1.99.1)
net-ssh (2.3.0) net-ssh (2.3.0)
@ -290,11 +291,11 @@ GEM
railties (~> 3.2.0) railties (~> 3.2.0)
sass (>= 3.1.10) sass (>= 3.1.10)
tilt (~> 1.3) tilt (~> 1.3)
selenium-webdriver (2.21.0) selenium-webdriver (2.21.1)
childprocess (>= 0.2.5) childprocess (>= 0.2.5)
ffi (~> 1.0) ffi (~> 1.0)
libwebsocket (~> 0.1.3) libwebsocket (~> 0.1.3)
multi_json (~> 1.0) multi_json (< 1.3)
rubyzip rubyzip
shoulda-matchers (1.1.0) shoulda-matchers (1.1.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)

1
locomotive_cms.gemspec
View File

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