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

dependency conflict with carrierwave and custom_fields (fixed)

Browse Source
This commit is contained in:
Didier Lafforgue 2012-06-08 10:57:09 +02:00
parent 11c4f98efc
commit 50204b6556
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Gemfile.lock
View File

@ -1,22 +1,21 @@
PATH PATH
remote: . remote: .
specs: specs:
locomotive_cms (2.0.0.rc8) locomotive_cms (2.0.0.rc7)
RedCloth (~> 4.2.8) RedCloth (~> 4.2.8)
actionmailer-with-request (~> 0.3.0) actionmailer-with-request (~> 0.3.0)
bson_ext (~> 1.5.2) bson_ext (~> 1.5.2)
cancan (~> 1.6.7) cancan (~> 1.6.7)
carrierwave (~> 0.6.0) carrierwave-mongoid (~> 0.2.1)
carrierwave-mongoid (~> 0.1.3)
cells (~> 3.8.0) cells (~> 3.8.0)
codemirror-rails (~> 2.21) codemirror-rails (~> 2.21)
custom_fields (~> 2.0.0.rc11) custom_fields (~> 2.0.0.rc12)
devise (~> 1.5.3) devise (~> 1.5.3)
dragonfly (~> 0.9.8) dragonfly (~> 0.9.8)
flash_cookie_session (~> 1.1.1) flash_cookie_session (~> 1.1.1)
fog (~> 1.3.1) fog (~> 1.3.1)
formtastic (~> 2.0.2) formtastic (~> 2.0.2)
haml (~> 3.1.4) haml (~> 3.1.6)
highline (~> 1.6.2) highline (~> 1.6.2)
httparty (~> 0.8.1) httparty (~> 0.8.1)
jquery-rails (~> 1.0.19) jquery-rails (~> 1.0.19)
@ -89,8 +88,8 @@ GEM
carrierwave (0.6.2) carrierwave (0.6.2)
activemodel (>= 3.2.0) activemodel (>= 3.2.0)
activesupport (>= 3.2.0) activesupport (>= 3.2.0)
carrierwave-mongoid (0.1.3) carrierwave-mongoid (0.2.1)
carrierwave (>= 0.5.6) carrierwave (~> 0.6.1)
mongoid (~> 2.1) mongoid (~> 2.1)
cells (3.8.5) cells (3.8.5)
actionpack (~> 3.0) actionpack (~> 3.0)
@ -122,9 +121,9 @@ GEM
capybara (>= 1.1.2) capybara (>= 1.1.2)
cucumber (>= 1.1.8) cucumber (>= 1.1.8)
nokogiri (>= 1.5.0) nokogiri (>= 1.5.0)
custom_fields (2.0.0.rc11) custom_fields (2.0.0.rc12)
activesupport (~> 3.2.1) activesupport (~> 3.2.1)
carrierwave-mongoid (~> 0.1.3) carrierwave-mongoid (~> 0.2.1)
mongoid (~> 2.4.9) mongoid (~> 2.4.9)
database_cleaner (0.8.0) database_cleaner (0.8.0)
devise (1.5.3) devise (1.5.3)
@ -207,9 +206,9 @@ GEM
mocha (0.9.12) mocha (0.9.12)
mongo (1.5.2) mongo (1.5.2)
bson (= 1.5.2) bson (= 1.5.2)
mongoid (2.4.10) mongoid (2.4.11)
activemodel (~> 3.1) activemodel (~> 3.1)
mongo (~> 1.3) mongo (<= 1.6.2)
tzinfo (~> 0.3.22) tzinfo (~> 0.3.22)
multi_json (1.3.6) multi_json (1.3.6)
multi_xml (0.5.1) multi_xml (0.5.1)
@ -286,7 +285,7 @@ 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.22.1) selenium-webdriver (2.22.2)
childprocess (>= 0.2.5) childprocess (>= 0.2.5)
ffi (~> 1.0) ffi (~> 1.0)
libwebsocket (~> 0.1.3) libwebsocket (~> 0.1.3)

8
locomotive_cms.gemspec
View File

@ -30,11 +30,11 @@ Gem::Specification.new do |s|
s.add_dependency 'mongoid', '~> 2.4.9' s.add_dependency 'mongoid', '~> 2.4.9'
s.add_dependency 'locomotive-mongoid-tree', '~> 0.6.2' s.add_dependency 'locomotive-mongoid-tree', '~> 0.6.2'
s.add_dependency 'custom_fields', '~> 2.0.0.rc11' s.add_dependency 'custom_fields', '~> 2.0.0.rc12'
s.add_dependency 'kaminari', '~> 0.13.0' s.add_dependency 'kaminari', '~> 0.13.0'
s.add_dependency 'haml', '~> 3.1.4' s.add_dependency 'haml', '~> 3.1.6'
s.add_dependency 'jquery-rails', '~> 1.0.19' s.add_dependency 'jquery-rails', '~> 1.0.19'
s.add_dependency 'rails-backbone', '~> 0.6.1' s.add_dependency 'rails-backbone', '~> 0.6.1'
s.add_dependency 'codemirror-rails', '~> 2.21' s.add_dependency 'codemirror-rails', '~> 2.21'
@ -52,8 +52,8 @@ Gem::Specification.new do |s|
s.add_dependency 'unidecoder', '~> 1.1.1' s.add_dependency 'unidecoder', '~> 1.1.1'
s.add_dependency 'rmagick', '~> 2.12.2' s.add_dependency 'rmagick', '~> 2.12.2'
s.add_dependency 'carrierwave-mongoid', '~> 0.1.3' s.add_dependency 'carrierwave-mongoid', '~> 0.2.1'
s.add_dependency 'carrierwave', '~> 0.6.0' # s.add_dependency 'carrierwave', '~> 0.6.2'
s.add_dependency 'fog', '~> 1.3.1' s.add_dependency 'fog', '~> 1.3.1'
s.add_dependency 'dragonfly', '~> 0.9.8' s.add_dependency 'dragonfly', '~> 0.9.8'
s.add_dependency 'rack-cache', '~> 1.1' s.add_dependency 'rack-cache', '~> 1.1'