diff options
| author | ThibG <thib@sitedethib.com> | 2019-07-29 23:37:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-29 23:37:14 +0200 |
| commit | f48c7689d230b915ed740a4774736bd5998cbc66 (patch) | |
| tree | 3d883f06fe8e3abbc5653e029ac8612ae114f135 /app/models/media_attachment.rb | |
| parent | a4a81c5434c73139f7c1d66f2687039237c5208a (diff) | |
| parent | 51411267fda00db576230a270a10e31992378c18 (diff) | |
Merge pull request #1179 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/media_attachment.rb')
| -rw-r--r-- | app/models/media_attachment.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index 189d80e77..be762889c 100644 --- a/app/models/media_attachment.rb +++ b/app/models/media_attachment.rb @@ -113,7 +113,7 @@ class MediaAttachment < ApplicationRecord has_attached_file :file, styles: ->(f) { file_styles f }, processors: ->(f) { file_processors f }, - convert_options: { all: '-quality 90 -strip' } + convert_options: { all: '-quality 90 -strip +set modify-date +set create-date' } validates_attachment_content_type :file, content_type: IMAGE_MIME_TYPES + VIDEO_MIME_TYPES + AUDIO_MIME_TYPES validates_attachment_size :file, less_than: IMAGE_LIMIT, unless: :larger_media_format? |