kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Rescue StandardError, not Exception

See merge request !1893
This commit is contained in:
Robert Speicher 2015-11-25 01:52:22 +00:00
parent 0fb5ffd8b0 a2915aeb66
commit 9a4ae85948
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/merge_requests/merge_service.rb
View File

@ -38,7 +38,7 @@ module MergeRequests
} }
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