From: Tom Hughes <tom@compton.nu>
Date: Mon, 6 Mar 2017 17:54:26 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1477'
X-Git-Tag: live~4601
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/49c3af4a32b38eaebdd9f819bf288a9b80495c12?hp=d007956865e622b7d10e26e32a4f036535aae8df

Merge remote-tracking branch 'openstreetmap/pull/1477'
---

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index ff3f67efd..acc478c15 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -365,7 +365,8 @@ class ApplicationController < ActionController::Base
   rescue ActionView::Template::Error => ex
     ex = ex.original_exception
 
-    if ex.is_a?(ActiveRecord::StatementInvalid) && ex.message =~ /execution expired/
+    if ex.is_a?(Timeout::Error) ||
+       (ex.is_a?(ActiveRecord::StatementInvalid) && ex.message =~ /execution expired/)
       render :action => "timeout"
     else
       raise