diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:14:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:14:08 -0400 |
| commit | 9981972844401f5f1f91e3452943eb4b8999699a (patch) | |
| tree | a38b3333ea5f711efe286fcdda2237b348ad21ff /app/workers/import_worker.rb | |
| parent | 6b41fb2e6ffa11aa70d14600ad26575bf9aec112 (diff) | |
| parent | 5f61ef24175b5f20bc6e384418413ed2967d17dc (diff) | |
Merge branch 'master' into patch-1
Diffstat (limited to 'app/workers/import_worker.rb')
| -rw-r--r-- | app/workers/import_worker.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/workers/import_worker.rb b/app/workers/import_worker.rb index 7cf29fb53..d5a33cada 100644 --- a/app/workers/import_worker.rb +++ b/app/workers/import_worker.rb @@ -46,7 +46,7 @@ class ImportWorker begin FollowService.new.call(from_account, row[0]) - rescue Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError + rescue Mastodon::NotPermittedError, ActiveRecord::RecordNotFound, Goldfinger::Error, HTTP::Error, OpenSSL::SSL::SSLError next end end |