diff options
| author | ThibG <thib@sitedethib.com> | 2019-07-15 01:04:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-15 01:04:31 +0200 |
| commit | 5ccd011cc3bafc00a557dabbb47da004f3d4a381 (patch) | |
| tree | c64218e9cdd13570181b0a1b9c86289aa4b22254 /app/services/block_service.rb | |
| parent | 1b074d2a50a331cdd03296170f04a75eec97a519 (diff) | |
| parent | 3ad8c9ea61759c8ac12744f2b7b263711403b41c (diff) | |
Merge pull request #1161 from ThibG/glitch-soc/cherry-pick-upstream
Cherry pick changes from upstream
Diffstat (limited to 'app/services/block_service.rb')
| -rw-r--r-- | app/services/block_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/block_service.rb b/app/services/block_service.rb index 9050a4858..0d9a6eccd 100644 --- a/app/services/block_service.rb +++ b/app/services/block_service.rb @@ -8,7 +8,7 @@ class BlockService < BaseService UnfollowService.new.call(account, target_account) if account.following?(target_account) UnfollowService.new.call(target_account, account) if target_account.following?(account) - RejectFollowService.new.call(account, target_account) if target_account.requested?(account) + RejectFollowService.new.call(target_account, account) if target_account.requested?(account) block = account.block!(target_account) |