user/gitlab-foss: upgrade to 16.1.0
This commit is contained in:
parent
b62b816e42
commit
5097bd10bf
3 changed files with 32 additions and 71 deletions
|
@ -1,11 +1,11 @@
|
|||
diff --git a/config/database.yml.postgresql.orig b/config/database.yml.postgresql
|
||||
index c1b1247..dbe5b77 100644
|
||||
index b210b9c..9006120 100644
|
||||
--- a/config/database.yml.postgresql.orig
|
||||
+++ b/config/database.yml.postgresql
|
||||
@@ -26,14 +26,7 @@ production:
|
||||
# username: git
|
||||
# password: "secure password"
|
||||
# host: localhost
|
||||
@@ -26,13 +26,6 @@ production:
|
||||
username: git
|
||||
password: "secure password"
|
||||
host: localhost
|
||||
- geo:
|
||||
- adapter: postgresql
|
||||
- encoding: unicode
|
||||
|
@ -13,15 +13,13 @@ index c1b1247..dbe5b77 100644
|
|||
- username: git
|
||||
- password: "secure password"
|
||||
- host: localhost
|
||||
-
|
||||
+
|
||||
|
||||
#
|
||||
# Development specific
|
||||
#
|
||||
@@ -57,13 +50,6 @@ development:
|
||||
# host: localhost
|
||||
# variables:
|
||||
# statement_timeout: 15s
|
||||
host: localhost
|
||||
variables:
|
||||
statement_timeout: 15s
|
||||
- geo:
|
||||
- adapter: postgresql
|
||||
- encoding: unicode
|
||||
|
@ -33,9 +31,9 @@ index c1b1247..dbe5b77 100644
|
|||
#
|
||||
# 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
|
||||
|
@ -46,10 +44,10 @@ index c1b1247..dbe5b77 100644
|
|||
|
||||
# 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,17 +96,3 @@ test: &test
|
||||
prepared_statements: false
|
||||
variables:
|
||||
statement_timeout: 15s
|
||||
- geo:
|
||||
- adapter: postgresql
|
||||
- encoding: unicode
|
||||
|
@ -57,3 +55,10 @@ index c1b1247..dbe5b77 100644
|
|||
- username: postgres
|
||||
- password:
|
||||
- host: localhost
|
||||
- embedding:
|
||||
- adapter: postgresql
|
||||
- encoding: unicode
|
||||
- database: gitlabhq_embedding_test
|
||||
- username: postgres
|
||||
- password:
|
||||
- host: localhost
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue