upgrade carrierwave to 0.6.2
This commit is contained in:
parent
20a63e3497
commit
d069865c42
3 changed files with 13 additions and 11 deletions
2
Gemfile
2
Gemfile
|
|
@ -62,7 +62,7 @@ gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite'
|
|||
|
||||
# file uploading
|
||||
|
||||
gem 'carrierwave', '0.5.8'
|
||||
gem 'carrierwave', '0.6.2'
|
||||
gem 'fog'
|
||||
gem 'fastercsv', '1.5.4', :require => false
|
||||
gem 'mini_magick', '3.4'
|
||||
|
|
|
|||
|
|
@ -91,8 +91,9 @@ GEM
|
|||
rack-test (>= 0.5.4)
|
||||
selenium-webdriver (~> 2.0)
|
||||
xpath (~> 0.1.4)
|
||||
carrierwave (0.5.8)
|
||||
activesupport (~> 3.0)
|
||||
carrierwave (0.6.2)
|
||||
activemodel (>= 3.2.0)
|
||||
activesupport (>= 3.2.0)
|
||||
cgi_multipart_eof_fix (2.5.0)
|
||||
childprocess (0.3.2)
|
||||
ffi (~> 1.0.6)
|
||||
|
|
@ -472,7 +473,7 @@ DEPENDENCIES
|
|||
capistrano-ext
|
||||
capistrano_colors
|
||||
capybara (~> 1.1.2)
|
||||
carrierwave (= 0.5.8)
|
||||
carrierwave (= 0.6.2)
|
||||
client_side_validations
|
||||
cucumber-rails (= 1.3.0)
|
||||
database_cleaner (= 0.7.1)
|
||||
|
|
|
|||
|
|
@ -4,16 +4,17 @@
|
|||
|
||||
#Excon needs to see the CA Cert Bundle file
|
||||
ENV["SSL_CERT_FILE"] = AppConfig[:ca_file]
|
||||
|
||||
CarrierWave.configure do |config|
|
||||
if !Rails.env.test? && AppConfig[:s3_key] && AppConfig[:s3_secret] && AppConfig[:s3_bucket] && AppConfig[:s3_region]
|
||||
config.storage = :s3
|
||||
config.s3_access_key_id = AppConfig[:s3_key]
|
||||
config.s3_secret_access_key = AppConfig[:s3_secret]
|
||||
config.s3_bucket = AppConfig[:s3_bucket]
|
||||
config.s3_region = AppConfig[:s3_region]
|
||||
config.s3_use_ssl = true
|
||||
config.storage = :fog
|
||||
config.cache_dir = "#{Rails.root}/tmp/uploads"
|
||||
config.fog_credentials = {
|
||||
:provider => 'AWS',
|
||||
:aws_access_key_id => AppConfig[:s3_key],
|
||||
:aws_secret_access_key => AppConfig[:s3_secret],
|
||||
:region => AppConfig[:s3_region]
|
||||
}
|
||||
config.fog_directory = AppConfig[:s3_bucket]
|
||||
else
|
||||
config.storage = :file
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in a new issue