diff options
| author | Reverite <github@reverite.sh> | 2019-06-09 16:54:21 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-06-09 16:54:21 -0700 |
| commit | 3614718bc91f90a6dc19dd80ecf3bc191283c24e (patch) | |
| tree | ad35f4dbe92fdbc3f95881d6be3d4f9b29d4a704 /app/models/media_attachment.rb | |
| parent | 846a09a7435fb9eb435e9950175ee0e696ed4909 (diff) | |
| parent | e16c8fbc7a2b5a866960a87bc8c950ad0d38f61b (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/models/media_attachment.rb')
| -rw-r--r-- | app/models/media_attachment.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index 65f00e1c8..70a671b4a 100644 --- a/app/models/media_attachment.rb +++ b/app/models/media_attachment.rb @@ -101,8 +101,8 @@ class MediaAttachment < ApplicationRecord }, }.freeze - IMAGE_LIMIT = 8.megabytes - VIDEO_LIMIT = 40.megabytes + IMAGE_LIMIT = (ENV['MAX_IMAGE_SIZE'] || 8.megabytes).to_i + VIDEO_LIMIT = (ENV['MAX_VIDEO_SIZE'] || 40.megabytes).to_i belongs_to :account, inverse_of: :media_attachments, optional: true belongs_to :status, inverse_of: :media_attachments, optional: true |