diff options
Diffstat (limited to 'app/services/merge_requests/merge_service.rb')
| -rw-r--r-- | app/services/merge_requests/merge_service.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb index 5e7eee4f1c3..f51923b7035 100644 --- a/app/services/merge_requests/merge_service.rb +++ b/app/services/merge_requests/merge_service.rb @@ -117,6 +117,8 @@ module MergeRequests if delete_source_branch? MergeRequests::DeleteSourceBranchWorker.perform_async(@merge_request.id, @merge_request.source_branch_sha, branch_deletion_user.id) end + + merge_request_merge_param end def clean_merge_jid @@ -135,6 +137,12 @@ module MergeRequests @merge_request.can_remove_source_branch?(branch_deletion_user) end + def merge_request_merge_param + if @merge_request.can_remove_source_branch?(branch_deletion_user) && !params.fetch('should_remove_source_branch', nil).nil? + @merge_request.update(merge_params: @merge_request.merge_params.merge('should_remove_source_branch' => params['should_remove_source_branch'])) + end + end + def handle_merge_error(log_message:, save_message_on_model: false) Gitlab::AppLogger.error("MergeService ERROR: #{merge_request_info} - #{log_message}") @merge_request.update(merge_error: log_message) if save_message_on_model |