Commit a2915aeb authored by Robert Speicher's avatar Robert Speicher
Browse files

Rescue StandardError, not Exception

parent 0fb5ffd8
......@@ -38,7 +38,7 @@ def commit
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")
return false
Supports Markdown
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