From 5ea7b8ee134f8b52e9485bc439f3a38e714adb1c Mon Sep 17 00:00:00 2001
From: Benjamin Neff <benjamin@coding4coffee.ch>
Date: Tue, 22 Aug 2017 01:00:48 +0200
Subject: [PATCH] Set fog_provider and load carrierwave/storage/fog if S3 is
enabled
Fixes #7563
closes #7566
---
Changelog.md | 3 ++-
config/initializers/carrierwave.rb | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/Changelog.md b/Changelog.md
index e7e141c2ab..570726956c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -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)
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
index 0321d52429..dd63980ae7 100644
--- a/config/initializers/carrierwave.rb
+++ b/config/initializers/carrierwave.rb
@@ -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 = {
--
GitLab