From 9f93af100b70bb7993c0de88ed42551627cc86cb Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 11 Jan 2012 20:14:28 +0800 Subject: [PATCH] merge with master --- Gemfile | 3 ++- Gemfile.lock | 8 ++++++-- config/initializers/carrierwave.rb | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 4fe1340a..d1f032c7 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,8 @@ gem 'rails' gem 'yajl-ruby', :require => 'yajl' gem 'bson_ext' -gem 'carrierwave', '0.5.4' +gem 'carrierwave' +gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid' gem 'ckeditor' gem 'devise' gem 'mini_magick' diff --git a/Gemfile.lock b/Gemfile.lock index fcf8f0b9..a9a33774 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -46,8 +46,11 @@ GEM bson_ext (1.5.2) bson (= 1.5.2) builder (3.0.0) - carrierwave (0.5.4) + carrierwave (0.5.8) activesupport (~> 3.0) + carrierwave-mongoid (0.1.0) + carrierwave + mongoid chronic (0.6.6) ckeditor (3.6.3) mime-types (~> 1.16) @@ -190,7 +193,8 @@ PLATFORMS DEPENDENCIES bson_ext - carrierwave (= 0.5.4) + carrierwave + carrierwave-mongoid ckeditor coffee-rails database_cleaner diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb index 1c7f73c1..11d91bdb 100644 --- a/config/initializers/carrierwave.rb +++ b/config/initializers/carrierwave.rb @@ -1,4 +1,4 @@ -require 'carrierwave/orm/mongoid' +#require 'carrierwave/orm/mongoid' begin db_config = YAML::load(File.read(File.join(Rails.root, "/config/mongoid.yml")))