diff options
Diffstat (limited to 'app/workers/merge_worker.rb')
-rw-r--r-- | app/workers/merge_worker.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/workers/merge_worker.rb b/app/workers/merge_worker.rb index a0594b15e31..29f0c0bbbf4 100644 --- a/app/workers/merge_worker.rb +++ b/app/workers/merge_worker.rb @@ -16,8 +16,6 @@ class MergeWorker # rubocop:disable Scalability/IdempotentWorker deduplicate :until_executed, including_scheduled: true def perform(merge_request_id, current_user_id, params) - params = params.with_indifferent_access - begin current_user = User.find(current_user_id) merge_request = MergeRequest.find(merge_request_id) @@ -25,6 +23,9 @@ class MergeWorker # rubocop:disable Scalability/IdempotentWorker return end + params = params.with_indifferent_access + params[:check_mergeability_retry_lease] = true unless params.has_key?(:check_mergeability_retry_lease) + MergeRequests::MergeService.new(project: merge_request.target_project, current_user: current_user, params: params) .execute(merge_request) end |