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

Merge branch 'master' into 236_paginate_has_many

This commit is contained in:
Mario Visic 2011-11-05 18:03:27 +11:00
parent 06ab49ecec 732f8f76f3
commit 45d4b7cb60
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@ -10,8 +10,10 @@ gem 'warden'
gem 'devise', '1.3.4'
gem 'devise_bushido_authenticatable', '1.0.0.alpha10', :require => 'devise_cas_authenticatable'
gem 'mongo', '~> 1.3.1'
gem 'bson', '~> 1.3.1'
gem 'bson_ext', '~> 1.3.1'
gem 'mongoid', '~> 2.0.2'
gem 'bson_ext', '~> 1.4.0'
gem 'locomotive_mongoid_acts_as_tree', '0.1.5.7', :require => 'mongoid_acts_as_tree'
gem 'kaminari'

12
Gemfile.lock
View File

@ -42,8 +42,8 @@ GEM
autotest (4.4.6)
ZenTest (>= 4.4.1)
bcrypt-ruby (2.1.4)
bson (1.4.0)
bson_ext (1.4.0)
bson (1.3.1)
bson_ext (1.3.1)
builder (2.1.2)
bushido (0.0.35)
highline (>= 1.6.1)
@ -170,8 +170,8 @@ GEM
mimemagic (0.1.8)
mimetype-fu (0.1.2)
mocha (0.9.12)
mongo (1.4.0)
bson (= 1.4.0)
mongo (1.3.1)
bson (>= 1.3.1)
mongoid (2.0.2)
activemodel (~> 3.0)
mongo (~> 1.3)
@ -286,7 +286,8 @@ DEPENDENCIES
ZenTest
actionmailer-with-request
autotest
bson_ext (~> 1.4.0)
bson (~> 1.3.1)
bson_ext (~> 1.3.1)
bushido (= 0.0.35)
bushido_stub (= 0.0.3)
cancan
@ -318,6 +319,7 @@ DEPENDENCIES
locomotive_mongoid_acts_as_tree (= 0.1.5.7)
mimetype-fu
mocha (= 0.9.12)
mongo (~> 1.3.1)
mongoid (~> 2.0.2)
pickle
rack-cache

6
locomotive_cms.gemspec
View File

@ -21,8 +21,12 @@ Gem::Specification.new do |s|
s.add_dependency 'warden'
s.add_dependency 'devise', '1.3.4'
s.add_dependency 'devise_bushido_authenticatable', '1.0.0.alpha10'
s.add_dependency 'mongo', '~> 1.3.1'
s.add_dependency 'bson', '~> 1.3.1'
s.add_dependency 'bson_ext', '~> 1.3.1'
s.add_dependency 'mongoid', '~> 2.0.2'
s.add_dependency 'bson_ext', '~> 1.4.0'
s.add_dependency 'locomotive_mongoid_acts_as_tree', '0.1.5.7'
s.add_dependency 'kaminari'