diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 21:59:21 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 21:59:21 -0400 |
commit | 4c05f0e630aacad594e7b21147340e2c0a0ac8ad (patch) | |
tree | 4ef28c2f42dd8e4cdfd9815dd6550b5bd2601f36 /app/workers/import_worker.rb | |
parent | 96812a6c792c8b048ed8d4a50351d9696dcf0f77 (diff) | |
parent | d438eab67301e767bdd040c6f9bd831c92214656 (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 |