summaryrefslogtreecommitdiff
path: root/app/workers/merge_worker.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/workers/merge_worker.rb')
-rw-r--r--app/workers/merge_worker.rb3
1 files changed, 1 insertions, 2 deletions
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