Rescue StandardError, not Exception

2015-11-24 16:12:25 -05:00 · 2015-11-24 16:12:25 -05:00 · a2915aeb66
parent 0fb5ffd8b0
commit a2915aeb66
1 changed files with 1 additions and 1 deletions
--- 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