Skip to content

GitLab

Commit 9a4ae859 authored by Robert Speicher's avatar Robert Speicher
Browse files
Options

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

Rescue StandardError, not Exception

See merge request !1893
parents 0fb5ffd8 a2915aeb
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
app/services/merge_requests/merge_service.rb
View file @ 9a4ae859
...@@ -38,7 +38,7 @@ def commit ...@@ -38,7 +38,7 @@ def commit
} }
repository.merge(current_user, merge_request.source_sha, merge_request.target_branch, options) 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") merge_request.update(merge_error: "Something went wrong during merge")
Rails.logger.error(e.message) Rails.logger.error(e.message)
return false 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