From cea455d3900445160bab2cf878ce4662410c7ca8 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 27 Oct 2017 19:21:19 +0100 Subject: [PATCH] Update for ActionView::Template::Error change --- app/controllers/application_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 0988fcdf8..5905b3759 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -366,7 +366,7 @@ class ApplicationController < ActionController::Base yield end rescue ActionView::Template::Error => ex - ex = ex.original_exception + ex = ex.cause if ex.is_a?(Timeout::Error) || (ex.is_a?(ActiveRecord::StatementInvalid) && ex.message =~ /execution expired/) -- 2.43.2