diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:11:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:11:24 -0400 |
| commit | 451b7431c9d0a8bb34642d5af599bc48701376d2 (patch) | |
| tree | 1be076bbade89fa78872d09b8961b5a183230e25 /app/workers/import_worker.rb | |
| parent | 8fa8004a2b090a3911cce11473bb926ebd6782a6 (diff) | |
| parent | 530725ba3c4fefc6fd3e45cda588daa5af2ea9ec (diff) | |
Merge branch 'master' into patch-2
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 |