diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-03-27 10:26:47 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-03-27 10:26:47 -0500 |
| commit | f61aa8e0f7101b5b7510a3809c94b7083ba08329 (patch) | |
| tree | 3677a21fdbd4174125495e3545c527e8aff47297 /app/models/concerns/account_avatar.rb | |
| parent | 6af17b79c57b95a39fb4ed325aeff3edf02162ea (diff) | |
| parent | 40e5d2303ba1edc51beae66cc15263675980106a (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: app/javascript/styles/mastodon/components.scss app/models/media_attachment.rb
Diffstat (limited to 'app/models/concerns/account_avatar.rb')
| -rw-r--r-- | app/models/concerns/account_avatar.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/concerns/account_avatar.rb b/app/models/concerns/account_avatar.rb index 9e34a9461..2d5ebfca3 100644 --- a/app/models/concerns/account_avatar.rb +++ b/app/models/concerns/account_avatar.rb @@ -4,6 +4,7 @@ module AccountAvatar extend ActiveSupport::Concern IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze + LIMIT = 2.megabytes class_methods do def avatar_styles(file) @@ -19,7 +20,8 @@ module AccountAvatar # Avatar upload has_attached_file :avatar, styles: ->(f) { avatar_styles(f) }, convert_options: { all: '-strip' }, processors: [:lazy_thumbnail] validates_attachment_content_type :avatar, content_type: IMAGE_MIME_TYPES - validates_attachment_size :avatar, less_than: 2.megabytes + validates_attachment_size :avatar, less_than: LIMIT + remotable_attachment :avatar, LIMIT end def avatar_original_url |