Merge branch 'master' into glitch-soc/merge-upstream

No conflicts.
2019-01-19 18:28:37 +01:00
parent 530d29148c 7c3fddeab4
commit 5e0cf92fd1
57 changed files with 1103 additions and 444 deletions
--- a/config/initializers/paperclip.rb
+++ b/config/initializers/paperclip.rb
@ -36,6 +36,9 @@ if ENV['S3_ENABLED'] == 'true'
    },
    s3_options: {
      signature_version: ENV.fetch('S3_SIGNATURE_VERSION') { 'v4' },
+      http_open_timeout: 5,
+      http_read_timeout: 5,
+      http_idle_timeout: 5,
    }
  )