Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

5 files changed, 14 insertions, 4 deletions

diff --git a/app/workers/merge_requests/assignees_change_worker.rb b/app/workers/merge_requests/assignees_change_worker.rb
index 9865563e357..fe39f20151f 100644
--- a/app/workers/merge_requests/assignees_change_worker.rb
+++ b/app/workers/merge_requests/assignees_change_worker.rb
@@ -3,6 +3,8 @@
 class MergeRequests::AssigneesChangeWorker
   include ApplicationWorker
 
+  sidekiq_options retry: 3
+
   feature_category :source_code_management
   urgency :high
   deduplicate :until_executed
@@ -19,7 +21,7 @@ class MergeRequests::AssigneesChangeWorker
     return if users.blank?
 
     ::MergeRequests::HandleAssigneesChangeService
-      .new(merge_request.target_project, current_user)
+      .new(project: merge_request.target_project, current_user: current_user)
       .execute(merge_request, users, execute_hooks: true)
   rescue ActiveRecord::RecordNotFound
   end
diff --git a/app/workers/merge_requests/create_pipeline_worker.rb b/app/workers/merge_requests/create_pipeline_worker.rb
index 244ba1af300..a79a92a5419 100644
--- a/app/workers/merge_requests/create_pipeline_worker.rb
+++ b/app/workers/merge_requests/create_pipeline_worker.rb
@@ -3,6 +3,8 @@
 module MergeRequests
   class CreatePipelineWorker
     include ApplicationWorker
+
+    sidekiq_options retry: 3
     include PipelineQueue
 
     queue_namespace :pipeline_creation
@@ -21,7 +23,7 @@ module MergeRequests
       merge_request = MergeRequest.find_by_id(merge_request_id)
       return unless merge_request
 
-      MergeRequests::CreatePipelineService.new(project, user).execute(merge_request)
+      MergeRequests::CreatePipelineService.new(project: project, current_user: user).execute(merge_request)
       merge_request.update_head_pipeline
     end
   end
diff --git a/app/workers/merge_requests/delete_source_branch_worker.rb b/app/workers/merge_requests/delete_source_branch_worker.rb
index eb83d10af33..1ce3a99b298 100644
--- a/app/workers/merge_requests/delete_source_branch_worker.rb
+++ b/app/workers/merge_requests/delete_source_branch_worker.rb
@@ -3,6 +3,8 @@
 class MergeRequests::DeleteSourceBranchWorker
   include ApplicationWorker
 
+  sidekiq_options retry: 3
+
   feature_category :source_code_management
   urgency :high
   idempotent!
@@ -17,7 +19,7 @@ class MergeRequests::DeleteSourceBranchWorker
     ::Branches::DeleteService.new(merge_request.source_project, user)
       .execute(merge_request.source_branch)
 
-    ::MergeRequests::RetargetChainService.new(merge_request.source_project, user)
+    ::MergeRequests::RetargetChainService.new(project: merge_request.source_project, current_user: user)
       .execute(merge_request)
   rescue ActiveRecord::RecordNotFound
   end
diff --git a/app/workers/merge_requests/handle_assignees_change_worker.rb b/app/workers/merge_requests/handle_assignees_change_worker.rb
index e79d8293bae..4c0500cd520 100644
--- a/app/workers/merge_requests/handle_assignees_change_worker.rb
+++ b/app/workers/merge_requests/handle_assignees_change_worker.rb
@@ -3,6 +3,8 @@
 class MergeRequests::HandleAssigneesChangeWorker
   include ApplicationWorker
 
+  sidekiq_options retry: 3
+
   feature_category :code_review
   urgency :high
   deduplicate :until_executed
@@ -15,7 +17,7 @@ class MergeRequests::HandleAssigneesChangeWorker
     old_assignees = User.id_in(old_assignee_ids)
 
     ::MergeRequests::HandleAssigneesChangeService
-      .new(merge_request.target_project, user)
+      .new(project: merge_request.target_project, current_user: user)
       .execute(merge_request, old_assignees, options)
   rescue ActiveRecord::RecordNotFound
   end
diff --git a/app/workers/merge_requests/resolve_todos_worker.rb b/app/workers/merge_requests/resolve_todos_worker.rb
index 2a5f742f809..8bb88091efe 100644
--- a/app/workers/merge_requests/resolve_todos_worker.rb
+++ b/app/workers/merge_requests/resolve_todos_worker.rb
@@ -3,6 +3,8 @@
 class MergeRequests::ResolveTodosWorker
   include ApplicationWorker
 
+  sidekiq_options retry: 3
+
   feature_category :code_review
   urgency :high
   deduplicate :until_executed