From 45b849bad98ffad9ce9ce39f1aa984ca4b7329f9 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 24 Mar 2019 12:36:26 +0100
Subject: [PATCH] Fix MergeWorker being queued for remote users (#10355)
---
app/models/follow_request.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb
index c5451a0507..96ac7eaa59 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
--
GitLab