diff options
Diffstat (limited to 'app/services/merge_requests/merge_to_ref_service.rb')
-rw-r--r-- | app/services/merge_requests/merge_to_ref_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/merge_requests/merge_to_ref_service.rb b/app/services/merge_requests/merge_to_ref_service.rb index 37b5805ae7e..1876b1096fe 100644 --- a/app/services/merge_requests/merge_to_ref_service.rb +++ b/app/services/merge_requests/merge_to_ref_service.rb @@ -60,7 +60,7 @@ module MergeRequests def commit repository.merge_to_ref(current_user, source, merge_request, target_ref, commit_message, first_parent_ref) - rescue Gitlab::Git::PreReceiveError => error + rescue Gitlab::Git::PreReceiveError, Gitlab::Git::CommandError => error raise MergeError, error.message end end |