user/gitlab-foss: upgrade to ruby 3.1
This commit is contained in:
parent
c2f76ea621
commit
631d8dcb67
4 changed files with 307 additions and 67 deletions
|
@ -1,11 +1,11 @@
|
|||
diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql
|
||||
index 5329a8e..a4daab1 100644
|
||||
--- a/config/database.yml.postgresql
|
||||
diff --git a/config/database.yml.postgresql.orig b/config/database.yml.postgresql
|
||||
index c1b1247..dbe5b77 100644
|
||||
--- a/config/database.yml.postgresql.orig
|
||||
+++ b/config/database.yml.postgresql
|
||||
@@ -18,13 +18,6 @@ production:
|
||||
# port: 8600
|
||||
# record: secondary.postgresql.service.consul
|
||||
# interval: 300
|
||||
@@ -26,14 +26,7 @@ production:
|
||||
# username: git
|
||||
# password: "secure password"
|
||||
# host: localhost
|
||||
- geo:
|
||||
- adapter: postgresql
|
||||
- encoding: unicode
|
||||
|
@ -13,13 +13,15 @@ index 5329a8e..a4daab1 100644
|
|||
- username: git
|
||||
- password: "secure password"
|
||||
- host: localhost
|
||||
|
||||
-
|
||||
+
|
||||
#
|
||||
# Development specific
|
||||
@@ -39,13 +32,6 @@ development:
|
||||
host: localhost
|
||||
variables:
|
||||
statement_timeout: 15s
|
||||
#
|
||||
@@ -57,13 +50,6 @@ development:
|
||||
# host: localhost
|
||||
# variables:
|
||||
# statement_timeout: 15s
|
||||
- geo:
|
||||
- adapter: postgresql
|
||||
- encoding: unicode
|
||||
|
@ -30,10 +32,10 @@ index 5329a8e..a4daab1 100644
|
|||
|
||||
#
|
||||
# Staging specific
|
||||
@@ -58,13 +44,6 @@ staging:
|
||||
username: git
|
||||
password: "secure password"
|
||||
host: localhost
|
||||
@@ -84,13 +70,6 @@ staging:
|
||||
# username: git
|
||||
# password: "secure password"
|
||||
# host: localhost
|
||||
- geo:
|
||||
- adapter: postgresql
|
||||
- encoding: unicode
|
||||
|
@ -44,10 +46,10 @@ index 5329a8e..a4daab1 100644
|
|||
|
||||
# Warning: The database defined as "test" will be erased and
|
||||
# re-generated from your development database when you run "rake".
|
||||
@@ -80,10 +59,3 @@ test: &test
|
||||
prepared_statements: false
|
||||
variables:
|
||||
statement_timeout: 15s
|
||||
@@ -117,10 +96,3 @@ test: &test
|
||||
# prepared_statements: false
|
||||
# variables:
|
||||
# statement_timeout: 15s
|
||||
- geo:
|
||||
- adapter: postgresql
|
||||
- encoding: unicode
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue