Merge branch 'develop' of https://code.gab.com/gab/social/gab-social into develop

app/models/follow_request.rb

@@ -26,7 +26,6 @@ class FollowRequest < ApplicationRecord
 
   def authorize!
     account.follow!(target_account)
-    MergeWorker.perform_async(target_account.id, account.id) if account.local?
     destroy!
   end
 

app/services/follow_service.rb

@@ -54,8 +54,6 @@ class FollowService < BaseService
       LocalNotificationWorker.perform_async(target_account.id, follow.id, follow.class.name)
     end
 
-    MergeWorker.perform_async(target_account.id, source_account.id)
-
     follow
   end
 

app/services/unfollow_service.rb

@@ -19,7 +19,6 @@ class UnfollowService < BaseService
     return unless follow
 
     follow.destroy!
-    UnmergeWorker.perform_async(@target_account.id, @source_account.id)
     follow
   end
 

app/services/unmute_service.rb

@@ -5,7 +5,5 @@ class UnmuteService < BaseService
     return unless account.muting?(target_account)
 
     account.unmute!(target_account)
-
-    MergeWorker.perform_async(target_account.id, account.id) if account.following?(target_account)
   end
 end