Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/workers/rebase_worker.rb')
-rw-r--r--app/workers/rebase_worker.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/workers/rebase_worker.rb b/app/workers/rebase_worker.rb
index ee9ae827bb6..664905eb9e5 100644
--- a/app/workers/rebase_worker.rb
+++ b/app/workers/rebase_worker.rb
@@ -5,6 +5,8 @@
class RebaseWorker # rubocop:disable Scalability/IdempotentWorker
include ApplicationWorker
+ sidekiq_options retry: 3
+
feature_category :source_code_management
weight 2
loggable_arguments 2
@@ -14,7 +16,7 @@ class RebaseWorker # rubocop:disable Scalability/IdempotentWorker
merge_request = MergeRequest.find(merge_request_id)
MergeRequests::RebaseService
- .new(merge_request.source_project, current_user)
+ .new(project: merge_request.source_project, current_user: current_user)
.execute(merge_request, skip_ci: skip_ci)
end
end