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

Use a later custom fields version.

Browse Source
This commit is contained in:
Mario Visic 2011-11-20 21:52:22 +11:00
parent 51c0397531
commit a97978468f
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@ -10,9 +10,9 @@ gem 'devise', :git => 'git://github.com/plataformatec/devise.git'#
gem 'cancan', '~> 1.6.7' gem 'cancan', '~> 1.6.7'
gem 'bson_ext', '~> 1.4.0' gem 'bson_ext', '~> 1.4.0'
gem 'mongoid', '~> 2.3.2' gem 'mongoid', '~> 2.3.3'
gem 'locomotive_mongoid_acts_as_tree', :git => 'git@github.com:locomotivecms/mongoid_acts_as_tree.git' gem 'locomotive_mongoid_acts_as_tree', :git => 'git@github.com:locomotivecms/mongoid_acts_as_tree.git'
gem 'custom_fields', :git => 'git://github.com/locomotivecms/custom_fields.git', :branch => 'mongoid_2_3_2' gem 'custom_fields', :git => 'git://github.com/locomotivecms/custom_fields.git'
gem 'kaminari' gem 'kaminari'
gem 'haml', '~> 3.1.3' gem 'haml', '~> 3.1.3'

13
Gemfile.lock
View File

@ -9,13 +9,12 @@ GIT
GIT GIT
remote: git://github.com/locomotivecms/custom_fields.git remote: git://github.com/locomotivecms/custom_fields.git
revision: e32bf03759e7eac2281e7eb35dc0b70fc684d8ad revision: af88a1602442c1507152426a5dcac662695c55ef
branch: mongoid_2_3_2
specs: specs:
custom_fields (1.1.0.rc1) custom_fields (1.1.0.rc1)
activesupport (~> 3.1.1) activesupport (~> 3.1.1)
carrierwave-mongoid (~> 0.1.3) carrierwave-mongoid (~> 0.1.3)
mongoid (= 2.3.2) mongoid (~> 2.3.3)
GIT GIT
remote: git://github.com/nragaz/uploadify-rails.git remote: git://github.com/nragaz/uploadify-rails.git
@ -104,7 +103,7 @@ GEM
rack-test (>= 0.5.4) rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0) selenium-webdriver (~> 2.0)
xpath (~> 0.1.4) xpath (~> 0.1.4)
carrierwave (0.5.7) carrierwave (0.5.8)
activesupport (~> 3.0) activesupport (~> 3.0)
carrierwave-mongoid (0.1.3) carrierwave-mongoid (0.1.3)
carrierwave (>= 0.5.6) carrierwave (>= 0.5.6)
@ -202,9 +201,9 @@ GEM
mocha (0.9.12) mocha (0.9.12)
mongo (1.4.0) mongo (1.4.0)
bson (= 1.4.0) bson (= 1.4.0)
mongoid (2.3.2) mongoid (2.3.3)
activemodel (~> 3.1) activemodel (~> 3.1)
mongo (~> 1.4) mongo (~> 1.3)
tzinfo (~> 0.3.22) tzinfo (~> 0.3.22)
multi_json (1.0.3) multi_json (1.0.3)
multi_xml (0.4.1) multi_xml (0.4.1)
@ -367,7 +366,7 @@ DEPENDENCIES
locomotive_mongoid_acts_as_tree! locomotive_mongoid_acts_as_tree!
mimetype-fu (~> 0.1.2) mimetype-fu (~> 0.1.2)
mocha (= 0.9.12) mocha (= 0.9.12)
mongoid (~> 2.3.2) mongoid (~> 2.3.3)
pickle pickle
rack-cache (~> 1.1) rack-cache (~> 1.1)
rails (~> 3.1.1) rails (~> 3.1.1)