diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-05-29 09:06:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-29 09:06:00 -0500 |
| commit | 6a1544bd4618706204eb8220c9da984be3103aa1 (patch) | |
| tree | 23327fe190fd90589c9dc8d64e96fcf0b7d28ddd /app/models/concerns/remotable.rb | |
| parent | 8b98afa781018bc7cfdb325f6b1fca0b1edcd8cb (diff) | |
| parent | c087738270e7fb16b1d284e8dd72cf99b4238bb8 (diff) | |
Merge pull request #525 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/concerns/remotable.rb')
| -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 20ddbca53..c17f04776 100644 --- 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 |