diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
| commit | 50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e (patch) | |
| tree | f2556b911180125ccbb7ed0e78a54e92da89adce /nixpkgs/pkgs/applications/version-management/gitlab/Remove-unsupported-database-names.patch | |
| parent | 4c16d4548a98563c9d9ad76f4e5b2202864ccd54 (diff) | |
| parent | cfc75eec4603c06503ae750f88cf397e00796ea8 (diff) | |
| download | nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.gz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.bz2 nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.lz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.xz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.zst nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.zip | |
Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8'
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/version-management/gitlab/Remove-unsupported-database-names.patch')
| -rw-r--r-- | nixpkgs/pkgs/applications/version-management/gitlab/Remove-unsupported-database-names.patch | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/Remove-unsupported-database-names.patch b/nixpkgs/pkgs/applications/version-management/gitlab/Remove-unsupported-database-names.patch index 7de1779f4a74..a87e7ac1618c 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/Remove-unsupported-database-names.patch +++ b/nixpkgs/pkgs/applications/version-management/gitlab/Remove-unsupported-database-names.patch @@ -1,15 +1,15 @@ -From 310245bad66048624e199000a1c7eb9d68ce2b5c Mon Sep 17 00:00:00 2001 +From 054e2e2092e3f20267a5d2046978df6d33c72712 Mon Sep 17 00:00:00 2001 From: Yaya <mak@nyantec.com> Date: Tue, 23 May 2023 13:49:18 +0000 Subject: [PATCH] Remove unsupported database names The only supported ones are main, ci, main_clusterwide. --- - config/database.yml.postgresql | 35 ---------------------------------- - 1 file changed, 35 deletions(-) + config/database.yml.postgresql | 37 ---------------------------------- + 1 file changed, 37 deletions(-) diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql -index b210b9c412bc..900612080416 100644 +index da9f458ff..2d6d44e37 100644 --- a/config/database.yml.postgresql +++ b/config/database.yml.postgresql @@ -26,13 +26,6 @@ production: @@ -54,8 +54,8 @@ index b210b9c412bc..900612080416 100644 # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". -@@ -117,17 +96,3 @@ test: &test - prepared_statements: false +@@ -119,19 +98,3 @@ test: &test + reaping_frequency: nil variables: statement_timeout: 15s - geo: @@ -65,6 +65,7 @@ index b210b9c412bc..900612080416 100644 - username: postgres - password: - host: localhost +- reaping_frequency: nil - embedding: - adapter: postgresql - encoding: unicode @@ -72,6 +73,7 @@ index b210b9c412bc..900612080416 100644 - username: postgres - password: - host: localhost +- reaping_frequency: nil -- -2.38.4 +2.40.1 |