about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-01-26 03:56:26 +0100
committerEugen Rochko <eugen@zeonfederated.com>2017-01-26 03:56:26 +0100
commit57f7cf834921d49f28f346571e0e6fb596ccd6f8 (patch)
tree85bd9bff54b8477d3d2a55383960f4a1c6e84783 /app
parenteb62778bec35e99eeadda1c77029142306ef1083 (diff)
Follow request authorizations faster
Diffstat (limited to 'app')
-rw-r--r--app/models/follow_request.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb
index 8eef3abf4..936ad0691 100644
--- a/app/models/follow_request.rb
+++ b/app/models/follow_request.rb
@@ -13,7 +13,7 @@ class FollowRequest < ApplicationRecord
 
   def authorize!
     account.follow!(target_account)
-    FeedManager.instance.merge_into_timeline(target_account, account)
+    MergeWorker.perform_async(target_account.id, account.id)
     destroy!
   end