diff options
Diffstat (limited to 'lib/api/merge_requests.rb')
| -rw-r--r-- | lib/api/merge_requests.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index cd46b442b68..e99e8f5421c 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -8,6 +8,10 @@ module API before { authenticate_non_get! } + rescue_from ActiveRecord::QueryCanceled do |_e| + render_api_error!({ error: 'Request timed out' }, 408) + end + helpers Helpers::MergeRequestsHelpers # These endpoints are defined in `TimeTrackingEndpoints` and is shared by |