diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:13:06 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 22:13:06 -0400 |
commit | cf13c97cb2890d7bf51540f632cf725f89baefd9 (patch) | |
tree | d58925eed77815140c011bb70667fdc4b80173c5 /app/workers/import_worker.rb | |
parent | 65b3a2a5a6e3151cf4da89132326b796a5c0687a (diff) | |
parent | 90a408f5927956f0cbe9b81812daca7b4a92d807 (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 |