diff options
| author | foxiehkins <foxiehkins@gmail.com> | 2017-04-07 14:01:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 14:01:20 +0100 |
| commit | 41396de7a90f23dd0afe1afa3dab1be43b7b6ecd (patch) | |
| tree | 5cacec3a442a671990f972196fa90c90903e83cf /app/workers/import_worker.rb | |
| parent | ac1989d2c07b707699641987d62697103698393c (diff) | |
| parent | 4e41cd9ab8f51120d558b70528b163c98993be53 (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 |