diff options
| author | Starfall <us@starfall.systems> | 2020-07-23 16:25:58 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2020-07-23 16:25:58 -0500 |
| commit | 2b41ed0fd69a7f7a0e17d6f0c6a421805c5e3127 (patch) | |
| tree | a3ab43415b061112bc614205a3bb96bb9718bbd0 /app/models/concerns | |
| parent | e3d96a9bc62f57d60dc21906b4b803e346b0a738 (diff) | |
| parent | 16416e940fd803af92377eee9a1756ef27eed199 (diff) | |
Merge branch 'glitch' into main
Diffstat (limited to 'app/models/concerns')
| -rw-r--r-- | app/models/concerns/remotable.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/remotable.rb b/app/models/concerns/remotable.rb index c6d0c7f1f..56b9c0164 100644 --- a/app/models/concerns/remotable.rb +++ b/app/models/concerns/remotable.rb @@ -29,7 +29,7 @@ module Remotable rescue Mastodon::UnexpectedResponseError, HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError => e Rails.logger.debug "Error fetching remote #{attachment_name}: #{e}" raise e unless suppress_errors - rescue Paperclip::Errors::NotIdentifiedByImageMagickError, Addressable::URI::InvalidURIError, Mastodon::HostValidationError, Mastodon::LengthValidationError, Paperclip::Error, Mastodon::DimensionsValidationError => e + rescue Paperclip::Errors::NotIdentifiedByImageMagickError, Addressable::URI::InvalidURIError, Mastodon::HostValidationError, Mastodon::LengthValidationError, Paperclip::Error, Mastodon::DimensionsValidationError, Mastodon::StreamValidationError => e Rails.logger.debug "Error fetching remote #{attachment_name}: #{e}" end |