diff options
Diffstat (limited to 'app/controllers/graphql_controller.rb')
| -rw-r--r-- | app/controllers/graphql_controller.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/controllers/graphql_controller.rb b/app/controllers/graphql_controller.rb index c71c101b434..67eeb43d5a2 100644 --- a/app/controllers/graphql_controller.rb +++ b/app/controllers/graphql_controller.rb @@ -82,6 +82,13 @@ class GraphqlController < ApplicationController render_error(exception.message, status: :unprocessable_entity) end + rescue_from ActiveRecord::QueryAborted do |exception| + log_exception(exception) + + error = "Request timed out. Please try a less complex query or a smaller set of records." + render_error(error, status: :service_unavailable) + end + override :feature_category def feature_category ::Gitlab::FeatureCategories.default.from_request(request) || super |