diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-01-19 18:28:37 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-01-19 18:28:37 +0100 |
| commit | 5e0cf92fd145b27053389e5ffcce48da77439713 (patch) | |
| tree | 27e1567b240f1a3117de595413ccceb9222d8465 /config/initializers | |
| parent | 530d29148ca0c5bf29f6fa516b1ef4f91d95894b (diff) | |
| parent | 7c3fddeab4c4ddebca7d5441ac67870aa1cecfe4 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
No conflicts.
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/paperclip.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb index 4bbf8b827..ce4185e02 100644 --- 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, } ) |