From e6bb4bd747a0120dd0207aecbb7c5c67b7caa165 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 23 Jan 2020 21:40:03 +0100 Subject: port tootsuite#12562 to monsterfork: Fix media attachments without file being uploadable Fix #12554 --- app/models/media_attachment.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/models') diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index d2db899ab..f8e925942 100644 --- a/app/models/media_attachment.rb +++ b/app/models/media_attachment.rb @@ -121,7 +121,8 @@ class MediaAttachment < ApplicationRecord include Attachmentable validates :account, presence: true - validates :description, length: { maximum: 6666 }, if: :local? + validates :description, length: { maximum: MAX_DESCRIPTION_LENGTH }, if: :local? + validates :file, presence: true, if: :local? scope :attached, -> { where.not(status_id: nil).or(where.not(scheduled_status_id: nil)) } scope :unattached, -> { where(status_id: nil, scheduled_status_id: nil) } -- cgit