Merge branch 'rs-rescue-standarderror' into 'master'

Rescue StandardError, not Exception See merge request !1893

Merge branch 'rs-rescue-standarderror' into 'master'
9a4ae859 · Robert Speicher · 0fb5ffd8 · a2915aeb · 9a4ae859
Commit 9a4ae859 authored Nov 25, 2015 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

merge_service.rb app/services/merge_requests/merge_service.rb +1 -1

No files found.
--- 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