diff options
| author | Anthony Bellew <anthonyreflected@gmail.com> | 2017-01-25 20:53:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-25 20:53:57 -0700 |
| commit | 3d890c407356c8e0e7dd9b64e8e232ededcff8e8 (patch) | |
| tree | a22df9a8737250f97a6024943af3445a163917b3 /app/services/follow_service.rb | |
| parent | febe2449bb14f3d877fb934ceb6d52e320712bac (diff) | |
| parent | 905c82917959a5afe24cb85c62c0b0ba13f0da8b (diff) | |
Merge pull request #3 from tootsuite/master
Updating to current
Diffstat (limited to 'app/services/follow_service.rb')
| -rw-r--r-- | app/services/follow_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb index 555f01b6d..87c16a621 100644 --- a/app/services/follow_service.rb +++ b/app/services/follow_service.rb @@ -38,7 +38,7 @@ class FollowService < BaseService NotificationWorker.perform_async(follow.stream_entry.id, target_account.id) end - FeedManager.instance.merge_into_timeline(target_account, source_account) + MergeWorker.perform_async(target_account.id, source_account.id) Pubsubhubbub::DistributionWorker.perform_async(follow.stream_entry.id) follow |