diff options
author | ThibG <thib@sitedethib.com> | 2018-08-21 19:54:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-21 19:54:21 +0200 |
commit | 37965ac8d9773ae79f6b8dd6fcd353894d2194ca (patch) | |
tree | 51f194442d2ec7ab760b443b98c7685f64481ca7 /app/services/after_block_domain_from_account_service.rb | |
parent | c78918162642649ce294d89effbf2e815c2aa327 (diff) | |
parent | 8b4abaa90d8dff64525d92c3ba1c750356608240 (diff) |
Merge pull request #660 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services/after_block_domain_from_account_service.rb')
-rw-r--r-- | app/services/after_block_domain_from_account_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/after_block_domain_from_account_service.rb b/app/services/after_block_domain_from_account_service.rb index 0f1a8505d..56cc819fb 100644 --- a/app/services/after_block_domain_from_account_service.rb +++ b/app/services/after_block_domain_from_account_service.rb @@ -15,13 +15,13 @@ class AfterBlockDomainFromAccountService < BaseService private def reject_existing_followers! - @account.passive_relationships.where(account: Account.where(domain: @domain)).includes(:account).find_each do |follow| + @account.passive_relationships.where(account: Account.where(domain: @domain)).includes(:account).reorder(nil).find_each do |follow| reject_follow!(follow) end end def reject_pending_follow_requests! - FollowRequest.where(target_account: @account).where(account: Account.where(domain: @domain)).includes(:account).find_each do |follow_request| + FollowRequest.where(target_account: @account).where(account: Account.where(domain: @domain)).includes(:account).reorder(nil).find_each do |follow_request| reject_follow!(follow_request) end end |