diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-11-24 16:12:25 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-11-24 16:12:25 -0500 |
| commit | a2915aeb662e30537f3f226e3db6d85fd252905f (patch) | |
| tree | 6c6b221d479dde11761523ead624a9142fcfe7e0 | |
| parent | 0fb5ffd8b0752f68db67414dc72d09ff0ef064d1 (diff) | |
| download | gitlab-ce-rs-rescue-standarderror.tar.gz | |
Rescue StandardError, not Exceptionrs-rescue-standarderror
| -rw-r--r-- | app/services/merge_requests/merge_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb index 7963af127e1..d619b72e3c2 100644 --- a/app/services/merge_requests/merge_service.rb +++ b/app/services/merge_requests/merge_service.rb @@ -38,7 +38,7 @@ module MergeRequests } repository.merge(current_user, merge_request.source_sha, merge_request.target_branch, options) - rescue Exception => e + rescue StandardError => e merge_request.update(merge_error: "Something went wrong during merge") Rails.logger.error(e.message) return false |