diff options
| author | André Lewin <andre.charles.lewin@gmail.com> | 2017-04-05 20:28:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-05 20:28:58 +0200 |
| commit | bf7cefa516075b480fd5da5ea4b1385d7d17bdd5 (patch) | |
| tree | 45bc6b379f5d06553d0a3e5bf4c0e2b452b7552f /app/workers/merge_worker.rb | |
| parent | 8736ef50ad13d5506bd6a673d4fcb96c33b609a3 (diff) | |
| parent | d13d169922c7efeb6e6c20ef6a271eeda552275f (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 |