diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 21:54:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 21:54:32 -0400 |
| commit | 7b7bff04df135aa76329696fbbceee9b80a70645 (patch) | |
| tree | a535a961e2af14bdc013274717b8098516cfee64 /app/workers/import_worker.rb | |
| parent | a31f5765afb2598937b418cce0b5bacdf71c5ba8 (diff) | |
| parent | e6596087977516270c8a805db962eb8b06e99d96 (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 |