diff options
| author | ThibG <thib@sitedethib.com> | 2018-05-11 20:34:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-11 20:34:19 +0200 |
| commit | da8897aaefeedf281a72f2e3b1b88ea0573e481e (patch) | |
| tree | 53a6ce915f8687b15e5bd5d06a53d08ed764d3da /app/models/concerns | |
| parent | e7ed61917b045f15776adbf257501dc9dac85557 (diff) | |
| parent | 45fce0e496727cd1579c630c22592638341f78c6 (diff) | |
Merge pull request #477 from ThibG/glitch-soc/merge
Merge upstream changes
Diffstat (limited to 'app/models/concerns')
| -rw-r--r-- | app/models/concerns/remotable.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/concerns/remotable.rb b/app/models/concerns/remotable.rb index 7f1ef5191..20ddbca53 100644 --- a/app/models/concerns/remotable.rb +++ b/app/models/concerns/remotable.rb @@ -41,6 +41,9 @@ 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 + Rails.logger.debug "Error processing remote #{attachment_name}: #{e}" + nil end end |