diff options
author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 21:49:18 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-07 21:49:18 -0400 |
commit | ed332693fea75ac5f95351e5cc2627ccfc21eb04 (patch) | |
tree | cb96d7cd349ebdc93104ec05886d8256467cdaf7 /app/workers/import_worker.rb | |
parent | 41a78be25e5b4d7b5f65cfbf4d6fba5184f41475 (diff) | |
parent | 881e4277fdd5116037a86af3c711d4b6ceb240d4 (diff) |
Merge branch 'master' into patch-1
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 |