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

gems dependency with mongoid was messy

This commit is contained in:
dinedine 2011-01-27 15:34:33 +01:00
parent 92ec43b2e0
commit 56059b6579
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -7,7 +7,7 @@ gem 'rails', '>= 3.0.0'
gem 'warden'
gem 'devise', '= 1.1.3'
gem 'mongoid', '2.0.0.rc.6'
gem 'mongoid', '~> 2.0.0.rc.6'
gem 'bson_ext', '1.2.0'
# gem 'locomotive_mongoid_acts_as_tree', :path => '../gems/acts_as_tree', :require => 'mongoid_acts_as_tree' # '0.1.5.1', :require => 'mongoid_acts_as_tree'
gem 'locomotive_mongoid_acts_as_tree', '0.1.5.2', :require => 'mongoid_acts_as_tree'

2
Gemfile.lock
View File

@ -281,7 +281,7 @@ DEPENDENCIES
locomotive_mongoid_acts_as_tree (= 0.1.5.2)
mimetype-fu
mocha!
mongoid (= 2.0.0.rc.6)
mongoid (~> 2.0.0.rc.6)
pickle
rails (>= 3.0.0)
rmagick (= 2.12.2)

6
locomotive_cms.gemspec
View File

@ -20,7 +20,7 @@ Gem::Specification.new do |s|
s.add_dependency "rails", ">= 3.0.0"
s.add_dependency "warden"
s.add_dependency "devise", "= 1.1.3"
s.add_dependency "mongoid", "2.0.0.rc.6"
s.add_dependency "mongoid", "~> 2.0.0.rc.6"
s.add_dependency "bson_ext", "= 1.2.0"
s.add_dependency "locomotive_mongoid_acts_as_tree", "0.1.5.2"
s.add_dependency "will_paginate"
@ -34,7 +34,7 @@ Gem::Specification.new do |s|
s.add_dependency "rmagick", "= 2.12.2"
s.add_dependency "locomotive_carrierwave", "0.5.0.1.beta2"
s.add_dependency "custom_fields", "1.0.0.beta3"
s.add_dependency "custom_fields", "1.0.0.beta4"
s.add_dependency "fog"
s.add_dependency "mimetype-fu"
s.add_dependency "actionmailer-with-request"
@ -42,7 +42,7 @@ Gem::Specification.new do |s|
s.add_dependency "httparty", ">= 0.6.1"
s.add_dependency "RedCloth"
s.add_dependency "delayed_job", "2.1.2"
s.add_dependency "delayed_job_mongoid", "1.0.1"
s.add_dependency "delayed_job_mongoid", "1.0.2"
s.add_dependency "rubyzip"
s.add_dependency "locomotive_jammit-s3"