Skip to content

Commit 3f3227e

Browse files
committed
gitlab: upgrade to 16.0.5
1 parent 05a1e2d commit 3f3227e

File tree

6 files changed

+27
-118
lines changed

6 files changed

+27
-118
lines changed

VERSIONS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
GITLAB_VERSION=15.11.6
1+
GITLAB_VERSION=16.0.5
22
ALPINE_VERSION=3.17
33
RUBY_VERSION=3.1

build-args.env

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
GITLAB_VERSION=15.11.6
2-
GITLAB_MAJOR_VERSION=15.11
3-
GITLAB_WORKHORSE_VERSION=15.11.6
4-
GITALY_SERVER_VERSION=15.11.6
5-
GITLAB_SHELL_VERSION=14.18.0
1+
GITLAB_VERSION=16.0.5
2+
GITLAB_MAJOR_VERSION=16.0
3+
GITLAB_WORKHORSE_VERSION=16.0.5
4+
GITALY_SERVER_VERSION=16.0.5
5+
GITLAB_SHELL_VERSION=14.20.0
Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql
2-
index c1b1247b5b08..a81437d1e1b5 100644
2+
index b210b9c412bc..900612080416 100644
33
--- a/config/database.yml.postgresql
44
+++ b/config/database.yml.postgresql
55
@@ -26,13 +26,6 @@ production:
6-
# username: git
7-
# password: "secure password"
8-
# host: localhost
6+
username: git
7+
password: "secure password"
8+
host: localhost
99
- geo:
1010
- adapter: postgresql
1111
- encoding: unicode
@@ -17,9 +17,9 @@ index c1b1247b5b08..a81437d1e1b5 100644
1717
#
1818
# Development specific
1919
@@ -57,13 +50,6 @@ development:
20-
# host: localhost
21-
# variables:
22-
# statement_timeout: 15s
20+
host: localhost
21+
variables:
22+
statement_timeout: 15s
2323
- geo:
2424
- adapter: postgresql
2525
- encoding: unicode
@@ -31,9 +31,9 @@ index c1b1247b5b08..a81437d1e1b5 100644
3131
#
3232
# Staging specific
3333
@@ -84,13 +70,6 @@ staging:
34-
# username: git
35-
# password: "secure password"
36-
# host: localhost
34+
username: git
35+
password: "secure password"
36+
host: localhost
3737
- geo:
3838
- adapter: postgresql
3939
- encoding: unicode
@@ -44,14 +44,21 @@ index c1b1247b5b08..a81437d1e1b5 100644
4444

4545
# Warning: The database defined as "test" will be erased and
4646
# re-generated from your development database when you run "rake".
47-
@@ -117,10 +96,3 @@ test: &test
48-
# prepared_statements: false
49-
# variables:
50-
# statement_timeout: 15s
47+
@@ -117,17 +96,3 @@ test: &test
48+
prepared_statements: false
49+
variables:
50+
statement_timeout: 15s
5151
- geo:
5252
- adapter: postgresql
5353
- encoding: unicode
5454
- database: gitlabhq_geo_test
5555
- username: postgres
5656
- password:
5757
- host: localhost
58+
- embedding:
59+
- adapter: postgresql
60+
- encoding: unicode
61+
- database: gitlabhq_embedding_test
62+
- username: postgres
63+
- password:
64+
- host: localhost

overlay/tmp/gitlab/mr-119042-mr-failed.patch

Lines changed: 0 additions & 61 deletions
This file was deleted.

overlay/tmp/gitlab/openssl-3.0.patch

Lines changed: 0 additions & 35 deletions
This file was deleted.

overlay/usr/local/bin/setup.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,6 @@ apply_patch -p0 -i /tmp/gitlab/puma-no-redirect.patch
109109
apply_patch -p0 -i /tmp/gitlab/puma-socket-path.patch
110110
apply_patch -p1 -i /tmp/gitlab/cable-defaults.patch
111111
apply_patch -p1 -i /tmp/gitlab/database-remove-geo.patch
112-
apply_patch -p1 -i /tmp/gitlab/mr-119042-mr-failed.patch
113-
apply_patch -p1 -i /tmp/gitlab/openssl-3.0.patch
114112
apply_patch -p1 -i /tmp/gitlab/ruby-3.1-compat.patch
115113
apply_patch -p0 -i /tmp/logrotate/logrotate-defaults.patch
116114
apply_patch -p0 -i /tmp/nginx/nginx-config.patch

0 commit comments

Comments
 (0)