Commit 5ea7b8ee authored by Benjamin Neff's avatar Benjamin Neff

Set fog_provider and load carrierwave/storage/fog if S3 is enabled

Fixes #7563

closes #7566
parent 398235ee
......@@ -5,7 +5,8 @@
* Remove Internet Explorer workarounds [#7557](https://github.com/diaspora/diaspora/pull/7557)
## Bug fixes
* Fix displaying posts with long labels [#7579](https://github.com/diaspora/diaspora/pull/7579)
* Fix displaying polls with long answers [#7579](https://github.com/diaspora/diaspora/pull/7579)
* Fix S3 support [#7566](https://github.com/diaspora/diaspora/pull/7566)
## Features
* Ask for confirmation when leaving a submittable comment field [#7530](https://github.com/diaspora/diaspora/pull/7530)
......
......@@ -6,6 +6,8 @@
ENV['SSL_CERT_FILE'] = AppConfig.environment.certificate_authorities.get
CarrierWave.configure do |config|
if !Rails.env.test? && AppConfig.environment.s3.enable?
config.fog_provider = "fog/aws"
require "carrierwave/storage/fog"
config.storage = :fog
config.cache_dir = Rails.root.join('tmp', 'uploads').to_s
config.fog_credentials = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment