Merge branch '31571-don-t-let-webhooks-jobs-go-to-the-dead-jobs-queue' into 'master'

Resolve "Don't let webhooks jobs go to the dead jobs queue"

Closes #31571

See merge request !12918

app/workers/project_service_worker.rb

@@ -2,6 +2,8 @@ class ProjectServiceWorker
   include Sidekiq::Worker
   include DedicatedSidekiqQueue
 
+  sidekiq_options dead: false
+
   def perform(hook_id, data)
     data = data.with_indifferent_access
     Service.find(hook_id).execute(data)

app/workers/web_hook_worker.rb

@@ -2,7 +2,7 @@ class WebHookWorker
   include Sidekiq::Worker
   include DedicatedSidekiqQueue
 
-  sidekiq_options retry: 4
+  sidekiq_options retry: 4, dead: false
 
   def perform(hook_id, data, hook_name)
     hook = WebHook.find(hook_id)

changelogs/unreleased/31571-don-t-let-webhooks-jobs-go-to-the-dead-jobs-queue.yml

+---
+title: Prevent web hook and project service background jobs from going to the dead
+  jobs queue
+merge_request:
+author: