diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-14 10:31:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-14 10:31:28 +0100 |
| commit | 72335694744da87cbfaff20992cb36817f6f8a60 (patch) | |
| tree | 55c1b799be04cf83f425414dce762bf9403e2b85 /app/models/media_attachment.rb | |
| parent | 81b1d32d5b618daa4003b8de8292ae4dd3e656f6 (diff) | |
| parent | c31e756644120cab650452e9d1c00a1e2f26ade4 (diff) | |
Merge pull request #1923 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/media_attachment.rb')
| -rw-r--r-- | app/models/media_attachment.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index 2bab8c0b6..6f079dd18 100644 --- a/app/models/media_attachment.rb +++ b/app/models/media_attachment.rb @@ -82,6 +82,7 @@ class MediaAttachment < ApplicationRecord IMAGE_CONVERTED_STYLES = { original: { format: 'jpeg', + content_type: 'image/jpeg', }.merge(IMAGE_STYLES[:original]).freeze, small: { |