Merge branch 'master' into glitch-soc/merge-upstream

2018-05-29 13:52:26 +02:00
parent 8b98afa781 90908fc24b
commit c087738270
37 changed files with 553 additions and 93 deletions
--- a/app/models/concerns/remotable.rb
+++ b/app/models/concerns/remotable.rb
@@ -41,7 +41,7 @@ module Remotable
        rescue HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError, Paperclip::Errors::NotIdentifiedByImageMagickError, Addressable::URI::InvalidURIError, Mastodon::HostValidationError, Mastodon::LengthValidationError => e
          Rails.logger.debug "Error fetching remote #{attachment_name}: #{e}"
          nil
-        rescue Paperclip::Error => e
+        rescue Paperclip::Error, Mastodon::DimensionsValidationError => e
          Rails.logger.debug "Error processing remote #{attachment_name}: #{e}"
          nil
        end