diff options
| author | Linus G Thiel <linus@yesbabyyes.se> | 2016-10-25 13:14:16 +0200 |
|---|---|---|
| committer | Linus G Thiel <linus@yesbabyyes.se> | 2016-10-25 13:14:16 +0200 |
| commit | cc8ebae527b270ea65d408fa60c2e5c78db5a155 (patch) | |
| tree | 8c40399b819956a32b916e538bcec94b3f04056d /app/workers/merge_worker.rb | |
| parent | 1ff140ea386d856c526b4797f38b4937e9b26f80 (diff) | |
| parent | ba27abec815e476481b976175c67273c1cbb6e57 (diff) | |
| download | gitlab-ce-cc8ebae527b270ea65d408fa60c2e5c78db5a155.tar.gz | |
Merge branch 'master' into 22743-issue-tooltip-will-not-disappear-going-back-to-previous-page
Diffstat (limited to 'app/workers/merge_worker.rb')
| -rw-r--r-- | app/workers/merge_worker.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/workers/merge_worker.rb b/app/workers/merge_worker.rb index c87c0a252b1..79efca4f2f9 100644 --- a/app/workers/merge_worker.rb +++ b/app/workers/merge_worker.rb @@ -1,7 +1,6 @@ class MergeWorker include Sidekiq::Worker - - sidekiq_options queue: :default + include DedicatedSidekiqQueue def perform(merge_request_id, current_user_id, params) params = params.with_indifferent_access |