Commit 9a4ae859 authored by Robert Speicher's avatar Robert Speicher

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

Rescue StandardError, not Exception

See merge request !1893
parents 0fb5ffd8 a2915aeb
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment