developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge with master

This commit is contained in:
unknown 2012-01-11 20:14:28 +08:00
parent 7ebfe3a7f9
commit 9f93af100b
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile
View File

@ -3,7 +3,8 @@ gem 'rails'
gem 'yajl-ruby', :require => 'yajl' gem 'yajl-ruby', :require => 'yajl'
gem 'bson_ext' gem 'bson_ext'
gem 'carrierwave', '0.5.4' gem 'carrierwave'
gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
gem 'ckeditor' gem 'ckeditor'
gem 'devise' gem 'devise'
gem 'mini_magick' gem 'mini_magick'

8
Gemfile.lock
View File

@ -46,8 +46,11 @@ GEM
bson_ext (1.5.2) bson_ext (1.5.2)
bson (= 1.5.2) bson (= 1.5.2)
builder (3.0.0) builder (3.0.0)
carrierwave (0.5.4) carrierwave (0.5.8)
activesupport (~> 3.0) activesupport (~> 3.0)
carrierwave-mongoid (0.1.0)
carrierwave
mongoid
chronic (0.6.6) chronic (0.6.6)
ckeditor (3.6.3) ckeditor (3.6.3)
mime-types (~> 1.16) mime-types (~> 1.16)
@ -190,7 +193,8 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
bson_ext bson_ext
carrierwave (= 0.5.4) carrierwave
carrierwave-mongoid
ckeditor ckeditor
coffee-rails coffee-rails
database_cleaner database_cleaner

2
config/initializers/carrierwave.rb
View File

@ -1,4 +1,4 @@
require 'carrierwave/orm/mongoid' #require 'carrierwave/orm/mongoid'
begin begin
db_config = YAML::load(File.read(File.join(Rails.root, "/config/mongoid.yml"))) db_config = YAML::load(File.read(File.join(Rails.root, "/config/mongoid.yml")))