diff options
| author | Reverite <github@reverite.sh> | 2019-03-30 23:42:55 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-03-30 23:42:55 -0700 |
| commit | 4d77314005483e53e320a82c87805c6bcca1c463 (patch) | |
| tree | 99f5b05bcbb1e8278517bf9a8f9ab114ab2dec45 /app/models/follow_request.rb | |
| parent | e356a902d23a0ed87c62717085a37d34550c8464 (diff) | |
| parent | 925830d11bb5c132e282f82bdb2ca893d87c9c24 (diff) | |
Merge branch 'glitch' into production
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 |