diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-07-28 16:28:05 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-07-28 16:28:05 +0200 |
| commit | bca3825c17dd2087f826d9269bb80537bd4ff395 (patch) | |
| tree | 51043b99ec56d263f9d126091afb923292a9e301 /app/models/media_attachment.rb | |
| parent | 91da921dbb51f55bc926c3997ae558d735292a67 (diff) | |
| parent | cfb2ed78231758a79af038a964ab7f7b7b35274e (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
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? |