diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:17:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:17:53 -0400 |
| commit | 3e8c1a1c36b9d5cba96968d351cae2e2eefc3d22 (patch) | |
| tree | 691bb470a0811e28b2ebd5d32255048a7df763b3 /app/workers/import_worker.rb | |
| parent | 7aede8e72092fa2b8846f2212dff411247a841b1 (diff) | |
| parent | 9fd8bbe15c18e0931ccf2c00fb6a1e69acfb0b0c (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 |