Rescue StandardError, not Exception
This commit is contained in:
parent
0fb5ffd8b0
commit
a2915aeb66
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue