about summary refs log tree commit diff
path: root/config/database.yml
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-12-06 12:44:38 +0100
committerThibaut Girka <thib@sitedethib.com>2018-12-06 12:44:38 +0100
commit1df392819d544e62ae9f685020e462c960d31635 (patch)
treee43bc3a7addbcc044979dbbc1cb44a86d4502efc /config/database.yml
parentfe9340d95e9ae9a1870e9951e9b00ad5df4cc257 (diff)
parent155cf126807ab25da4d0e5da55b2d598c981e2ab (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'config/database.yml')
-rw-r--r--config/database.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/database.yml b/config/database.yml
index 82e560515..90133881a 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -3,6 +3,8 @@ default: &default
   pool: <%= ENV["DB_POOL"] || ENV['MAX_THREADS'] || 5 %>
   timeout: 5000
   encoding: unicode
+  variables:
+    statement_timeout: 60000
 
 development:
   <<: *default