diff options
author | Robert Speicher <robert@gitlab.com> | 2015-11-25 01:52:22 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2015-11-25 01:52:22 +0000 |
commit | 9a4ae859487b42c1e7ada365bf4d45c569145bb3 (patch) | |
tree | 6c6b221d479dde11761523ead624a9142fcfe7e0 | |
parent | 0fb5ffd8b0752f68db67414dc72d09ff0ef064d1 (diff) | |
parent | a2915aeb662e30537f3f226e3db6d85fd252905f (diff) | |
download | gitlab-ce-9a4ae859487b42c1e7ada365bf4d45c569145bb3.tar.gz |
Merge branch 'rs-rescue-standarderror' into 'master'
Rescue StandardError, not Exception
See merge request !1893
-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 |