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/merge_requests/delete_source_branch_worker.rb')
-rw-r--r--app/workers/merge_requests/delete_source_branch_worker.rb13
1 files changed, 6 insertions, 7 deletions
diff --git a/app/workers/merge_requests/delete_source_branch_worker.rb b/app/workers/merge_requests/delete_source_branch_worker.rb
index 66392c670b5..96dde413d5b 100644
--- a/app/workers/merge_requests/delete_source_branch_worker.rb
+++ b/app/workers/merge_requests/delete_source_branch_worker.rb
@@ -18,15 +18,14 @@ class MergeRequests::DeleteSourceBranchWorker
# Source branch changed while it's being removed
return if merge_request.source_branch_sha != source_branch_sha
- delete_service_result = ::Branches::DeleteService.new(merge_request.source_project, user)
- .execute(merge_request.source_branch)
+ if Feature.enabled?(:add_delete_branch_worker, merge_request.source_project)
+ ::MergeRequests::DeleteBranchWorker.perform_async(merge_request_id, user_id, merge_request.source_branch, true)
+ else
+ ::Branches::DeleteService.new(merge_request.source_project, user).execute(merge_request.source_branch)
- if Feature.enabled?(:track_delete_source_errors, merge_request.source_project)
- delete_service_result.track_exception if delete_service_result&.error?
+ ::MergeRequests::RetargetChainService.new(project: merge_request.source_project, current_user: user)
+ .execute(merge_request)
end
-
- ::MergeRequests::RetargetChainService.new(project: merge_request.source_project, current_user: user)
- .execute(merge_request)
rescue ActiveRecord::RecordNotFound
end
end