diff options
| author | ThibG <thib@sitedethib.com> | 2019-01-20 13:56:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-20 13:56:37 +0100 |
| commit | aa362ab73dc7121104b3c01800152b9fc56ea396 (patch) | |
| tree | f0f5879a51325856887a2e32a4c3f9654af61aab /config/initializers | |
| parent | 530d29148ca0c5bf29f6fa516b1ef4f91d95894b (diff) | |
| parent | 5145c81620efbd5cf8dc911858d17d1fa888c996 (diff) | |
Merge pull request #888 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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, } ) |