diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-19 06:10:08 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-19 06:10:08 +0300 |
| commit | 66d5486a564c7bbdc730763a1689e09ae332dabe (patch) | |
| tree | 7fd36ade2c6fdcd8042abcc3866e8d131aa57095 /config | |
| parent | 70d9c92f0e81ae5f9cc82084e4b815a78596c76d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/database.yml.decomposed-clusterwide-postgresql | 5 | ||||
| -rw-r--r-- | config/database.yml.decomposed-postgresql | 4 | ||||
| -rw-r--r-- | config/database.yml.postgresql | 4 |
3 files changed, 13 insertions, 0 deletions
diff --git a/config/database.yml.decomposed-clusterwide-postgresql b/config/database.yml.decomposed-clusterwide-postgresql index 6439788524e..63d35184953 100644 --- a/config/database.yml.decomposed-clusterwide-postgresql +++ b/config/database.yml.decomposed-clusterwide-postgresql @@ -60,6 +60,7 @@ test: username: postgres password: prepared_statements: false + reaping_frequency: nil variables: statement_timeout: 15s ci: @@ -68,19 +69,23 @@ test: username: postgres password: prepared_statements: false + reaping_frequency: nil variables: statement_timeout: 15s main_clusterwide: <<: *main database_tasks: false + reaping_frequency: nil geo: <<: *defaults database: gitlabhq_geo_test username: postgres password: + reaping_frequency: nil embedding: <<: *defaults database: gitlabhq_embedding_test username: postgres password: + reaping_frequency: nil diff --git a/config/database.yml.decomposed-postgresql b/config/database.yml.decomposed-postgresql index 3b5d1ff2ed5..a2f9e42d620 100644 --- a/config/database.yml.decomposed-postgresql +++ b/config/database.yml.decomposed-postgresql @@ -84,6 +84,7 @@ test: &test password: host: localhost prepared_statements: false + reaping_frequency: nil variables: statement_timeout: 15s ci: @@ -94,6 +95,7 @@ test: &test password: host: localhost prepared_statements: false + reaping_frequency: nil variables: statement_timeout: 15s geo: @@ -103,6 +105,7 @@ test: &test username: postgres password: host: localhost + reaping_frequency: nil embedding: adapter: postgresql encoding: unicode @@ -110,3 +113,4 @@ test: &test username: postgres password: host: localhost + reaping_frequency: nil diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql index b210b9c412b..da9f458ff09 100644 --- a/config/database.yml.postgresql +++ b/config/database.yml.postgresql @@ -104,6 +104,7 @@ test: &test password: host: localhost prepared_statements: false + reaping_frequency: nil variables: statement_timeout: 15s ci: @@ -115,6 +116,7 @@ test: &test password: host: localhost prepared_statements: false + reaping_frequency: nil variables: statement_timeout: 15s geo: @@ -124,6 +126,7 @@ test: &test username: postgres password: host: localhost + reaping_frequency: nil embedding: adapter: postgresql encoding: unicode @@ -131,3 +134,4 @@ test: &test username: postgres password: host: localhost + reaping_frequency: nil |