fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-26 15:32:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix MergeWorker being queued for remote users (#10355)

Browse source
This commit is contained in:
Eugen Rochko 2019-03-24 12:36:26 +01:00 committed by GitHub
parent 0f9278c3d3
commit 45b849bad9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/follow_request.rb
View file

@ -26,7 +26,7 @@ class FollowRequest < ApplicationRecord
def authorize! def authorize!
account.follow!(target_account, reblogs: show_reblogs, uri: uri) 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! destroy!
end end