Add latest changes from gitlab-org/gitlab@13-3-stable-ee

1 files changed, 15 insertions, 0 deletions

diff --git a/app/controllers/concerns/graceful_timeout_handling.rb b/app/controllers/concerns/graceful_timeout_handling.rb
new file mode 100644
index 00000000000..490c0ec3b1d
--- /dev/null
+++ b/app/controllers/concerns/graceful_timeout_handling.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module GracefulTimeoutHandling
+  extend ActiveSupport::Concern
+
+  included do
+    rescue_from ActiveRecord::QueryCanceled do |exception|
+      raise exception unless request.format.json?
+
+      log_exception(exception)
+
+      render json: { error: _('There is too much data to calculate. Please change your selection.') }
+    end
+  end
+end