From: Thibaut Girka <thib@sitedethib.com>
Date: Thu, 6 Dec 2018 13:39:04 +0000 (+0100)
Subject: Revert "Add database statement timeout of 60s (#9382)"
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=24822eca73ac2bc37870bd27cae8ee6b17785759;p=mastodon.git

Revert "Add database statement timeout of 60s (#9382)"

This reverts commit 58a29db99d410771f62ffb9e8c2ce95e1d3cb4ae.
---

diff --git a/config/database.yml b/config/database.yml
index 90133881a..82e560515 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -3,8 +3,6 @@ default: &default
   pool: <%= ENV["DB_POOL"] || ENV['MAX_THREADS'] || 5 %>
   timeout: 5000
   encoding: unicode
-  variables:
-    statement_timeout: 60000
 
 development:
   <<: *default