diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-05-27 17:58:44 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-05-27 17:58:44 +0200 |
| commit | 10a31a934fb62a95d6144794b9c449f1092593f0 (patch) | |
| tree | 193863c7b8bbd25c77ea6489134db3cb9397ed3f /app/controllers/media_proxy_controller.rb | |
| parent | 2024aef0f9b52297d814811f5825678a563f78ff (diff) | |
| parent | 2efe711a517642cd7032aee318c85f6c158ee0ca (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Upstream's README got updated, but we have a completely different one. Kept ours.
Diffstat (limited to 'app/controllers/media_proxy_controller.rb')
| -rw-r--r-- | app/controllers/media_proxy_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/media_proxy_controller.rb b/app/controllers/media_proxy_controller.rb index 1b610318d..5596e92d1 100644 --- a/app/controllers/media_proxy_controller.rb +++ b/app/controllers/media_proxy_controller.rb @@ -45,7 +45,7 @@ class MediaProxyController < ApplicationController end def lock_options - { redis: Redis.current, key: "media_download:#{params[:id]}" } + { redis: Redis.current, key: "media_download:#{params[:id]}", autorelease: 15.minutes.seconds } end def reject_media? |