Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-25 15:17:21 +00:00
parent 995b59526b 85a395fab6
commit 837b3804bf
128 changed files with 1274 additions and 1030 deletions
--- 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' }