diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:21:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:21:21 -0400 |
| commit | fef478781d1033ba045806945f84cbab1bdb0007 (patch) | |
| tree | cf99ed9130e2226f13e52f87dc7bbe8a9b464ee2 /app/workers/import_worker.rb | |
| parent | bf7cefa516075b480fd5da5ea4b1385d7d17bdd5 (diff) | |
| parent | c1a553d2c274941f38cc299699dfae1f60559e67 (diff) | |
Merge branch 'master' into master
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 |