Download as
Browse Code »

Commit e50ba061f9938099a1196e10dc9b47d9b073a2df

Authored by Aurélio Heckert
1 parent e8f4fd2b
Exists in staging and in 32 other branches all_pending_tasks_api, api-articles-period, api_roles, comments_permissions, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_notification_email, follower_permition, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, profile_api_improvements, user_mention, webfinger_server

Makes max_size uniform between UploadedFile and Thumbnail 

closes #152
Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
app/models/thumbnail.rb
  Diff comments   View file @e50ba06
@@ -5,7 +5,7 @@ class Thumbnail < ActiveRecord::Base @@ -5,7 +5,7 @@ class Thumbnail < ActiveRecord::Base
5 attr_accessible :content_type, :filename, :thumbnail_resize_options, :thumbnail, :parent_id 5 attr_accessible :content_type, :filename, :thumbnail_resize_options, :thumbnail, :parent_id
6 6
7 has_attachment :storage => :file_system, 7 has_attachment :storage => :file_system,
8 - :content_type => :image, :max_size => 5.megabytes, processor: 'Rmagick' 8 + :content_type => :image, :max_size => UploadedFile.max_size, processor: 'Rmagick'
9 validates_as_attachment 9 validates_as_attachment
10 10
11 sanitize_filename 11 sanitize_filename