Merge branch 'master' into glitch-soc/merge-upstream

2018-12-06 12:44:38 +01:00
parent fe9340d95e 155cf12680
commit 1df392819d
16 changed files with 258 additions and 152 deletions
--- 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