Update carrierwave
#{column}_identifier must be used to get the name of the file
This commit is contained in:
parent
1bbb197fba
commit
04f51f2d98
5
Gemfile
5
Gemfile
|
@ -3,14 +3,15 @@ gem 'rails','>=3.1.0'
|
|||
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'
|
||||
gem 'rubyzip'
|
||||
gem 'sinatra'
|
||||
gem 'execjs'
|
||||
gem 'mongoid', :git => 'git://github.com/mongoid/mongoid.git', :ref => '7a915395db50e2bc6071a503a11530e644879e49'
|
||||
gem 'mongoid'
|
||||
|
||||
gem 'rake','0.8.7'
|
||||
gem 'jquery-rails'
|
||||
|
|
24
Gemfile.lock
24
Gemfile.lock
|
@ -1,13 +1,3 @@
|
|||
GIT
|
||||
remote: git://github.com/mongoid/mongoid.git
|
||||
revision: 7a915395db50e2bc6071a503a11530e644879e49
|
||||
ref: 7a915395db50e2bc6071a503a11530e644879e49
|
||||
specs:
|
||||
mongoid (2.4.0)
|
||||
activemodel (~> 3.1)
|
||||
mongo (~> 1.3)
|
||||
tzinfo (~> 0.3.22)
|
||||
|
||||
GEM
|
||||
remote: http://rubygems.org/
|
||||
specs:
|
||||
|
@ -47,8 +37,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.3)
|
||||
carrierwave (>= 0.5.6)
|
||||
mongoid (~> 2.1)
|
||||
chronic (0.6.6)
|
||||
ckeditor (3.6.3)
|
||||
mime-types (~> 1.16)
|
||||
|
@ -96,6 +89,10 @@ GEM
|
|||
subexec (~> 0.1.0)
|
||||
mongo (1.5.2)
|
||||
bson (= 1.5.2)
|
||||
mongoid (2.4.0)
|
||||
activemodel (~> 3.1)
|
||||
mongo (~> 1.3)
|
||||
tzinfo (~> 0.3.22)
|
||||
multi_json (1.0.4)
|
||||
orm_adapter (0.0.5)
|
||||
polyglot (0.3.3)
|
||||
|
@ -192,7 +189,8 @@ PLATFORMS
|
|||
|
||||
DEPENDENCIES
|
||||
bson_ext
|
||||
carrierwave (= 0.5.4)
|
||||
carrierwave
|
||||
carrierwave-mongoid
|
||||
ckeditor
|
||||
coffee-rails
|
||||
database_cleaner
|
||||
|
@ -203,7 +201,7 @@ DEPENDENCIES
|
|||
factory_girl_rails
|
||||
jquery-rails
|
||||
mini_magick
|
||||
mongoid!
|
||||
mongoid
|
||||
radius
|
||||
rails (>= 3.1.0)
|
||||
rake (= 0.8.7)
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
#require 'carrierwave/orm/mongoid'
|
||||
|
||||
begin
|
||||
db_config = YAML::load(File.read(File.join(Rails.root, "/config/mongoid.yml")))
|
||||
rescue
|
||||
|
@ -12,4 +10,6 @@ CarrierWave.configure do |config|
|
|||
config.grid_fs_port = db_config[Rails.env]['port']
|
||||
config.storage = :grid_fs
|
||||
config.grid_fs_access_url = "/gridfs"
|
||||
end
|
||||
end
|
||||
|
||||
CarrierWave::SanitizedFile.sanitize_regexp = /[^[:word:]\.\-\+]/
|
||||
|
|
Loading…
Reference in New Issue