diff options
| author | Luke Duncalfe <lduncalfe@eml.cc> | 2019-04-09 10:55:07 +1200 |
|---|---|---|
| committer | Luke Duncalfe <lduncalfe@eml.cc> | 2019-04-09 10:57:04 +1200 |
| commit | b5bcf80c9a7470ac36bdbefcb8056beff67712ae (patch) | |
| tree | 8bc00389e054d0aa68d659f9d117b8777f434c44 /app/services/merge_requests | |
| parent | 3c40c98e263328ceb11a008dbec108362e727dbc (diff) | |
| download | gitlab-ce-b5bcf80c9a7470ac36bdbefcb8056beff67712ae.tar.gz | |
Update service to handle unexpected exceptions43263-git-push-option-to-create-mr
This will ensure that now and in the future, PushOptionsHandlerService
will not cause the post_receive API endpoint from running other code if
something causes an unknown exception.
Diffstat (limited to 'app/services/merge_requests')
| -rw-r--r-- | app/services/merge_requests/push_options_handler_service.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/services/merge_requests/push_options_handler_service.rb b/app/services/merge_requests/push_options_handler_service.rb index 610d1db0506..d92eb0a68c3 100644 --- a/app/services/merge_requests/push_options_handler_service.rb +++ b/app/services/merge_requests/push_options_handler_service.rb @@ -24,6 +24,9 @@ module MergeRequests execute_for_branch(branch) rescue Gitlab::Access::AccessDeniedError errors << 'User access was denied' + rescue StandardError => e + Gitlab::AppLogger.error(e) + errors << 'An unknown error occurred' end self |