diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 18:08:19 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 18:08:19 +0000 |
| commit | a8de96bff51846e160b76506dc0ca0fe6f767f64 (patch) | |
| tree | 1036f1ca75aba492eaaa3439c84a3109b4684896 /app/services/merge_requests/merge_to_ref_service.rb | |
| parent | afe2b984524ae4b0c8a0636db7ec5b2c452f0734 (diff) | |
| download | gitlab-ce-a8de96bff51846e160b76506dc0ca0fe6f767f64.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
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 |