diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-03-24 12:36:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-24 12:36:26 +0100 |
| commit | 45b849bad98ffad9ce9ce39f1aa984ca4b7329f9 (patch) | |
| tree | 7b5f62e3793b3aa08dc4ed4237ee7cfd96a82da7 /app | |
| parent | 0f9278c3d35819635504d397ce43823c0ee1125c (diff) | |
Fix MergeWorker being queued for remote users (#10355)
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/follow_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb index c5451a050..96ac7eaa5 100644 --- a/app/models/follow_request.rb +++ b/app/models/follow_request.rb @@ -26,7 +26,7 @@ class FollowRequest < ApplicationRecord def authorize! account.follow!(target_account, reblogs: show_reblogs, uri: uri) - MergeWorker.perform_async(target_account.id, account.id) + MergeWorker.perform_async(target_account.id, account.id) if account.local? destroy! end |