about summary refs log tree commit diff
path: root/config/initializers
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-03-17 14:20:35 +0100
committerGitHub <noreply@github.com>2018-03-17 14:20:35 +0100
commit40871caa4b06c7ee1c3b07f439ed984ead295ced (patch)
tree0c7c94b578d9ba5170fe03c432c1de20633fd776 /config/initializers
parentcdf8b92fea269209cedf38c50bca276cdf47b1fe (diff)
Revert "Upgrade Paperclip to version 6.0.0" (#6807)
* Revert "Bump version to 2.3.2rc1"

This reverts commit cdf8b92fea269209cedf38c50bca276cdf47b1fe.

* Revert "Downgrade Dockerfile to Ruby 2.4.3 on Alpine 3.6 (#6806)"

This reverts commit 0074cad44ffcbbdbc798f57a21829359741e60d9.

* Revert "Handle Mastodon::HostValidationError when pulling remoteable assets (#6782)"

This reverts commit 4a0a19fe54f1d2d433ad3d72c35f2bbb915279f6.

* Revert "Correct the reference to user's password in mastodon:add_user task (#6800)"

This reverts commit 338bff8b93fa939c2968818e53386fd0c013d9a9.

* Revert "Upgrade Paperclip to version 6.0.0 (#6754)"

This reverts commit b88fcd53f711673b21e5ff4a547dbf929866a2ee.
Diffstat (limited to 'config/initializers')
-rw-r--r--config/initializers/paperclip.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
index 17a520aa2..8aa1d1b6e 100644
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@@ -14,7 +14,8 @@ Paperclip::Attachment.default_options.merge!(
 )
 
 if ENV['S3_ENABLED'] == 'true'
-  require 'aws-sdk-s3'
+  require 'aws-sdk'
+  Aws.eager_autoload!(services: %w(S3))
 
   s3_region   = ENV.fetch('S3_REGION')   { 'us-east-1' }
   s3_protocol = ENV.fetch('S3_PROTOCOL') { 'https' }