diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-04-03 17:21:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-03 17:21:33 +0200 |
| commit | 8192b0da7cd1fac38a68eab6746fc7ec74328a77 (patch) | |
| tree | 686c30ed5f6c4cfe5f6b4d84e46ff19f7baa6949 /app/models/concerns/attachmentable.rb | |
| parent | cbdb25ab0343603165fc89fd28b07c9ca0f2ae6d (diff) | |
| parent | 7b15f4006adb5f8f04d83174532c30eeb78757b0 (diff) | |
Merge pull request #2155 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/concerns/attachmentable.rb')
| -rw-r--r-- | app/models/concerns/attachmentable.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/attachmentable.rb b/app/models/concerns/attachmentable.rb index 01fae4236..d44c22438 100644 --- a/app/models/concerns/attachmentable.rb +++ b/app/models/concerns/attachmentable.rb @@ -5,7 +5,7 @@ require 'mime/types/columnar' module Attachmentable extend ActiveSupport::Concern - MAX_MATRIX_LIMIT = 16_777_216 # 4096x4096px or approx. 16MB + MAX_MATRIX_LIMIT = 33_177_600 # 7680x4320px or approx. 847MB in RAM GIF_MATRIX_LIMIT = 921_600 # 1280x720px # For some file extensions, there exist different content |