diff options
| author | JantsoP <jantso.porali@gmail.com> | 2017-04-04 08:41:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-04 08:41:46 +0200 |
| commit | db4a41cf58f6b15e380ff1fdbc8f392e31e4235b (patch) | |
| tree | a68429f1bade4869fccc4af5bcef8afbe570e1e1 /app/workers/merge_worker.rb | |
| parent | dc89fc17cc35f8e1deaffb30ae581ac453a7a9fc (diff) | |
| parent | eb023beb4975a019d6a3b3091483c91c2c837bbd (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'app/workers/merge_worker.rb')
| -rw-r--r-- | app/workers/merge_worker.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/workers/merge_worker.rb b/app/workers/merge_worker.rb index 0f288f43f..d745cb99c 100644 --- a/app/workers/merge_worker.rb +++ b/app/workers/merge_worker.rb @@ -3,6 +3,8 @@ class MergeWorker include Sidekiq::Worker + sidekiq_options queue: 'pull' + def perform(from_account_id, into_account_id) FeedManager.instance.merge_into_timeline(Account.find(from_account_id), Account.find(into_account_id)) end |