Merge branch 'master' into terms

[rails.git] / config / initializers / abstract_adapter.rb

diff --git a/config/initializers/abstract_adapter.rb b/config/initializers/abstract_adapter.rb
index fbae428cbbc5cc9b2dbdbfef312db0694ea90f27..5cc24d25c38489183a869661f7f3c68db3227a83 100644 (file)
--- a/config/initializers/abstract_adapter.rb
+++ b/config/initializers/abstract_adapter.rb
@@ -16,7 +16,7 @@ module ActiveRecord
         if ex.message =~ /^OSM::APITimeoutError: /
           raise OSM::APITimeoutError.new
         elsif ex.message =~ /^Timeout::Error: /
         if ex.message =~ /^OSM::APITimeoutError: /
           raise OSM::APITimeoutError.new
         elsif ex.message =~ /^Timeout::Error: /

-          raise Timeout::Error.new
+          raise Timeout::Error.new("time's up!")

         else
           raise
         end
         else
           raise
         end