diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-27 16:55:06 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-01-27 16:57:23 +0100 |
| commit | 450ad431801b5f2c716041920842a9851b9d133c (patch) | |
| tree | 06ecb71df5b2b36e9e125b62a70c4ca5504c8137 /app/models/media_attachment.rb | |
| parent | 9f57c7d4a681a6563be267f728dab3603f75fe79 (diff) | |
Do not run FetchLinkCardService on local URLs, increase file size limit to 8MB,
fix ProcessFeedService pushing status into distribution if called a second time while the first is still running (i.e. when a PuSH comes after a Salmon slap), fix not running escape on spoiler text before emojify
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 ecbed03e3..6925f9b0d 100644 --- a/app/models/media_attachment.rb +++ b/app/models/media_attachment.rb @@ -12,7 +12,7 @@ class MediaAttachment < ApplicationRecord processors: -> (f) { f.video? ? [:transcoder] : [:thumbnail] }, convert_options: { all: '-quality 90 -strip' } validates_attachment_content_type :file, content_type: IMAGE_MIME_TYPES + VIDEO_MIME_TYPES - validates_attachment_size :file, less_than: 4.megabytes + validates_attachment_size :file, less_than: 8.megabytes validates :account, presence: true |