diff options
| author | Yamagishi Kazutoshi <ykzts@desire.sh> | 2018-03-24 20:52:45 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-03-24 12:52:45 +0100 |
| commit | 28384c1771ccaa600e429f41cb2e19234961a9bd (patch) | |
| tree | 09b92ab4d21d0a63c8d57925db311619d16438dc /config/initializers/paperclip.rb | |
| parent | ff7941e652af1d54d9c991254556e7932a8b183c (diff) | |
Revert "Revert "Upgrade Paperclip to version 6.0.0" (#6807)" (#6808)
This reverts commit 40871caa4b06c7ee1c3b07f439ed984ead295ced.
Diffstat (limited to 'config/initializers/paperclip.rb')
| -rw-r--r-- | config/initializers/paperclip.rb | 3 |
1 files changed, 1 insertions, 2 deletions
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' } |