diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-17 17:17:21 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-17 17:17:21 +0000 |
| commit | 9341b982b611ed3655489a01ba32720b84dfefdc (patch) | |
| tree | 7abfc11e2beca92d2716fd6236a8ef9028fbaf31 /app/models | |
| parent | fe17446af0b13036c08335cebb7b0938c038667d (diff) | |
| parent | 566ace2d6479c05e51dd8ce24283b8606be631de (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/models')
| -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 020303a2f..69685ec83 100644 --- a/app/models/concerns/remotable.rb +++ b/app/models/concerns/remotable.rb @@ -38,7 +38,7 @@ module Remotable send("#{attachment_name}_file_name=", basename + extname) self[attribute_name] = url if has_attribute?(attribute_name) - rescue HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError, Paperclip::Errors::NotIdentifiedByImageMagickError, Addressable::URI::InvalidURIError => e + rescue HTTP::TimeoutError, HTTP::ConnectionError, OpenSSL::SSL::SSLError, Paperclip::Errors::NotIdentifiedByImageMagickError, Addressable::URI::InvalidURIError, Mastodon::HostValidationError => e Rails.logger.debug "Error fetching remote #{attachment_name}: #{e}" nil end |