diff options
| author | ThibG <thib@sitedethib.com> | 2020-07-22 15:39:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-22 15:39:36 +0200 |
| commit | 4024952b58bacb94d2cb43fafddf0e97bea4c55c (patch) | |
| tree | b1c1e5cdb84606879d65ecceebe4cf665332379b /app/models/concerns | |
| parent | 801e546ecc1efb4103232d8265229eb455a8dd5b (diff) | |
| parent | f8e315cd74d05a6878bbd018b20462daa0b5e660 (diff) | |
Merge pull request #1385 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 |