From 0b15570e497d3c5c515be59a43b686087b985f5c Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Tue, 28 Nov 2017 17:08:30 +0100
Subject: Add ApplicationWorker and make every worker include it

---
 app/workers/merge_worker.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'app/workers/merge_worker.rb')

diff --git a/app/workers/merge_worker.rb b/app/workers/merge_worker.rb
index 48e2da338f6..ba832fe30c6 100644
--- a/app/workers/merge_worker.rb
+++ b/app/workers/merge_worker.rb
@@ -1,6 +1,5 @@
 class MergeWorker
-  include Sidekiq::Worker
-  include DedicatedSidekiqQueue
+  include ApplicationWorker
 
   def perform(merge_request_id, current_user_id, params)
     params = params.with_indifferent_access
-- 
cgit v1.2.3