From 28384c1771ccaa600e429f41cb2e19234961a9bd Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Sat, 24 Mar 2018 20:52:45 +0900 Subject: Revert "Revert "Upgrade Paperclip to version 6.0.0" (#6807)" (#6808) This reverts commit 40871caa4b06c7ee1c3b07f439ed984ead295ced. --- config/initializers/paperclip.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'config/initializers/paperclip.rb') diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb index 8aa1d1b6e..17a520aa2 100644 --- a/config/initializers/paperclip.rb +++ b/config/initializers/paperclip.rb @@ -14,8 +14,7 @@ Paperclip::Attachment.default_options.merge!( ) if ENV['S3_ENABLED'] == 'true' - require 'aws-sdk' - Aws.eager_autoload!(services: %w(S3)) + require 'aws-sdk-s3' s3_region = ENV.fetch('S3_REGION') { 'us-east-1' } s3_protocol = ENV.fetch('S3_PROTOCOL') { 'https' } -- cgit