diff options
Diffstat (limited to 'www/gitlab-ce/files/patch-config_database.yml.postgresql')
| -rw-r--r-- | www/gitlab-ce/files/patch-config_database.yml.postgresql | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/www/gitlab-ce/files/patch-config_database.yml.postgresql b/www/gitlab-ce/files/patch-config_database.yml.postgresql index 25d933f3d56c..775a4dd2ff27 100644 --- a/www/gitlab-ce/files/patch-config_database.yml.postgresql +++ b/www/gitlab-ce/files/patch-config_database.yml.postgresql @@ -1,9 +1,9 @@ ---- config/database.yml.postgresql.orig 2023-02-21 16:38:51 UTC +--- config/database.yml.postgresql.orig 2023-05-18 16:48:55 UTC +++ config/database.yml.postgresql @@ -26,13 +26,6 @@ production: - # username: git - # password: "secure password" - # host: localhost + username: git + password: "secure password" + host: localhost - geo: - adapter: postgresql - encoding: unicode @@ -15,9 +15,9 @@ # # Development specific @@ -57,13 +50,6 @@ development: - # host: localhost - # variables: - # statement_timeout: 15s + host: localhost + variables: + statement_timeout: 15s - geo: - adapter: postgresql - encoding: unicode @@ -29,9 +29,9 @@ # # Staging specific @@ -84,13 +70,6 @@ staging: - # username: git - # password: "secure password" - # host: localhost + username: git + password: "secure password" + host: localhost - geo: - adapter: postgresql - encoding: unicode @@ -42,10 +42,10 @@ # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". -@@ -117,10 +96,3 @@ test: &test - # prepared_statements: false - # variables: - # statement_timeout: 15s +@@ -117,13 +96,6 @@ test: &test + prepared_statements: false + variables: + statement_timeout: 15s - geo: - adapter: postgresql - encoding: unicode @@ -53,3 +53,6 @@ - username: postgres - password: - host: localhost + embedding: + adapter: postgresql + encoding: unicode |