diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-26 19:51:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-26 19:51:28 +0100 |
| commit | bdf4f56f9a9052668e7cce1ce7863268e03d9c86 (patch) | |
| tree | 9952f2e08780455dc1af0febe4b374f5b8a60e2e /app/models/follow_request.rb | |
| parent | 9f56511860493b770c2e535be0f8ce4777c8d373 (diff) | |
| parent | 9e80b34a95c39d0a1a944713f0f4d6cc5e8b8c43 (diff) | |
Merge pull request #966 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/follow_request.rb')
| -rw-r--r-- | app/models/follow_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb index c5451a050..96ac7eaa5 100644 --- a/app/models/follow_request.rb +++ b/app/models/follow_request.rb @@ -26,7 +26,7 @@ class FollowRequest < ApplicationRecord def authorize! 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! end |