summaryrefslogtreecommitdiff
path: root/config/database.yml.postgresql
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-21 07:08:36 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-21 07:08:36 +0000
commit48aff82709769b098321c738f3444b9bdaa694c6 (patch)
treee00c7c43e2d9b603a5a6af576b1685e400410dee /config/database.yml.postgresql
parent879f5329ee916a948223f8f43d77fba4da6cd028 (diff)
downloadgitlab-ce-48aff82709769b098321c738f3444b9bdaa694c6.tar.gz
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'config/database.yml.postgresql')
-rw-r--r--config/database.yml.postgresql4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql
index 37c69ad326b..ca1ff4db1b4 100644
--- a/config/database.yml.postgresql
+++ b/config/database.yml.postgresql
@@ -28,6 +28,8 @@ development:
username: postgres
password: "secure password"
host: localhost
+ variables:
+ statement_timeout: 15s
#
# Staging specific
@@ -51,3 +53,5 @@ test: &test
password:
host: localhost
prepared_statements: false
+ variables:
+ statement_timeout: 15s