aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Fechner <mfechner@FreeBSD.org>2026-05-21 16:51:01 +0000
committerMatthias Fechner <mfechner@FreeBSD.org>2026-05-21 19:17:41 +0000
commitda57375c5341c42536c2aef6cd085858799b545d (patch)
tree8faa6af4f3c3095eacb4cbc93d12198ade9c6f63
parentfa8ca2b1ed8eab69f42b6a20a27cc01fcff43b5d (diff)
www/gitlab: major upgrade to 19.0.0
-rw-r--r--devel/gitaly/Makefile2
-rw-r--r--devel/gitaly/distinfo22
-rw-r--r--devel/gitlab-shell/Makefile3
-rw-r--r--devel/gitlab-shell/distinfo10
-rw-r--r--net/gitlab-agent/Makefile8
-rw-r--r--net/gitlab-agent/distinfo10
-rw-r--r--net/rubygem-gitaly/Makefile2
-rw-r--r--net/rubygem-gitaly/distinfo6
-rw-r--r--www/gitlab-pages/distinfo10
-rw-r--r--www/gitlab-workhorse/distinfo10
-rw-r--r--www/gitlab/Makefile62
-rw-r--r--www/gitlab/Makefile.common2
-rw-r--r--www/gitlab/distinfo12
-rw-r--r--www/gitlab/files/patch-Gemfile58
-rw-r--r--www/gitlab/files/patch-config_gitlab.yml.example20
15 files changed, 117 insertions, 120 deletions
diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 3e3f6a00f5d9..ff1679616b69 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -35,7 +35,7 @@ GL_TUPLE= gitlab-org:git:v${GITLAB_GIT_VERSION}:git_dep/_build/deps/git-v${GITLA
gitlab-org:git:${GITLAB_GIT_PREV_VERSION}:git_prev_dep/_build/deps/git-prev
GO_MOD_DIST= gitlab
-GO_MODULE= gitlab.com/gitlab-org/gitaly/v18
+GO_MODULE= gitlab.com/gitlab-org/gitaly/v19
MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}"
# make sure to pass go build options into make process
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 351816021797..cda69bf81447 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1778734232
-SHA256 (go/devel_gitaly/gitaly-v18.11.3/go.mod) = f9f452dae231ff3c8a5f01dd9dab293a271c6d7c2e2e406ab8e2e5ec758c450d
-SIZE (go/devel_gitaly/gitaly-v18.11.3/go.mod) = 13823
-SHA256 (go/devel_gitaly/gitaly-v18.11.3/gitaly-v18.11.3.tar.bz2) = 30195a0556c14c319b55f10720962a5c0f91086300726d06156b733b1747df1d
-SIZE (go/devel_gitaly/gitaly-v18.11.3/gitaly-v18.11.3.tar.bz2) = 4728195
-SHA256 (go/devel_gitaly/gitaly-v18.11.3/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4
-SIZE (go/devel_gitaly/gitaly-v18.11.3/git-v2.50.0.tar.bz2) = 9249878
-SHA256 (go/devel_gitaly/gitaly-v18.11.3/gitlab-org-git-b15384c06f77bc2d34d0d3623a8a58218313a561_GL0.tar.gz) = edad17ac5f10a37873aa5da1f7a556d7b81fa6b71ba623dbfed2b0c868ad8a92
-SIZE (go/devel_gitaly/gitaly-v18.11.3/gitlab-org-git-b15384c06f77bc2d34d0d3623a8a58218313a561_GL0.tar.gz) = 12072239
-SHA256 (go/devel_gitaly/gitaly-v18.11.3/gitlab-org-git-e417bf2996fbd77acabbf354ed9b5adedacf91c9_GL0.tar.gz) = afbeed5c85fae32fa2eb68b6d53c5f3aff6ac2fb89c8420d601f0755695e4c3e
-SIZE (go/devel_gitaly/gitaly-v18.11.3/gitlab-org-git-e417bf2996fbd77acabbf354ed9b5adedacf91c9_GL0.tar.gz) = 11990547
+TIMESTAMP = 1779350203
+SHA256 (go/devel_gitaly/gitaly-v19.0.0/go.mod) = 100aa15be2282788304b1d7516493ba8b2a1d601652ebd533b43ca67aee1c2f1
+SIZE (go/devel_gitaly/gitaly-v19.0.0/go.mod) = 15962
+SHA256 (go/devel_gitaly/gitaly-v19.0.0/gitaly-v19.0.0.tar.bz2) = 3cda873570f7bec870bae4cde20d10c307e18559da903cccde3d7de141b5115d
+SIZE (go/devel_gitaly/gitaly-v19.0.0/gitaly-v19.0.0.tar.bz2) = 4742179
+SHA256 (go/devel_gitaly/gitaly-v19.0.0/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4
+SIZE (go/devel_gitaly/gitaly-v19.0.0/git-v2.50.0.tar.bz2) = 9249878
+SHA256 (go/devel_gitaly/gitaly-v19.0.0/gitlab-org-git-b15384c06f77bc2d34d0d3623a8a58218313a561_GL0.tar.gz) = edad17ac5f10a37873aa5da1f7a556d7b81fa6b71ba623dbfed2b0c868ad8a92
+SIZE (go/devel_gitaly/gitaly-v19.0.0/gitlab-org-git-b15384c06f77bc2d34d0d3623a8a58218313a561_GL0.tar.gz) = 12072239
+SHA256 (go/devel_gitaly/gitaly-v19.0.0/gitlab-org-git-e417bf2996fbd77acabbf354ed9b5adedacf91c9_GL0.tar.gz) = afbeed5c85fae32fa2eb68b6d53c5f3aff6ac2fb89c8420d601f0755695e4c3e
+SIZE (go/devel_gitaly/gitaly-v19.0.0/gitlab-org-git-e417bf2996fbd77acabbf354ed9b5adedacf91c9_GL0.tar.gz) = 11990547
diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile
index d48d1cb50e12..097c03a179ad 100644
--- a/devel/gitlab-shell/Makefile
+++ b/devel/gitlab-shell/Makefile
@@ -1,7 +1,6 @@
PORTNAME= gitlab-shell
-PORTVERSION= 14.49.0
+PORTVERSION= 14.51.0
DISTVERSIONPREFIX= v
-PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= mfechner@FreeBSD.org
diff --git a/devel/gitlab-shell/distinfo b/devel/gitlab-shell/distinfo
index 9d38c393c55e..655cee66d671 100644
--- a/devel/gitlab-shell/distinfo
+++ b/devel/gitlab-shell/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1776334534
-SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.49.0/go.mod) = 32e326e288a18ce33ad267c88e7d72a8cd7c3007ae85223776c1a0ff6e58bc92
-SIZE (go/devel_gitlab-shell/gitlab-shell-v14.49.0/go.mod) = 6380
-SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.49.0/gitlab-shell-v14.49.0.tar.bz2) = 79b034c0cb70105412602cf103bf96f534a9697495a00fefea188a64ffc49633
-SIZE (go/devel_gitlab-shell/gitlab-shell-v14.49.0/gitlab-shell-v14.49.0.tar.bz2) = 184292
+TIMESTAMP = 1779339092
+SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.51.0/go.mod) = 92448664326065721a804784af7d0204a187e96240bfebc5652e513e2256ff15
+SIZE (go/devel_gitlab-shell/gitlab-shell-v14.51.0/go.mod) = 9587
+SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.51.0/gitlab-shell-v14.51.0.tar.bz2) = 3e620a023f957ba3842cd05e42a008de76196478168f271a089fd1cf847c609e
+SIZE (go/devel_gitlab-shell/gitlab-shell-v14.51.0/gitlab-shell-v14.51.0.tar.bz2) = 205687
diff --git a/net/gitlab-agent/Makefile b/net/gitlab-agent/Makefile
index fd163ae13835..3b12fa40836b 100644
--- a/net/gitlab-agent/Makefile
+++ b/net/gitlab-agent/Makefile
@@ -15,15 +15,15 @@ BUILD_DEPENDS= git>=0:devel/git \
golangci-lint>=0:devel/golangci-lint
USES= go:modules
-GO_MODULE= gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v18
+GO_MODULE= gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v19
_BUILD_DATE= $$(date -u "+%Y-%m-%d-%H%M UTC")
GO_TARGET= ./cmd/kas
GO_BUILDFLAGS= -tags="tracer_static,tracer_static_jaeger" \
-ldflags=" \
- -X 'gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v16/cmd.Version=v${PORTVERSION}' \
- -X 'gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v16/cmd.Commit=${GL_TAGNAME:C/^(........).*/\1/}' \
- -X 'gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v16/cmd.BuildTime=${_BUILD_DATE}'"
+ -X 'gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v19/cmd.Version=v${PORTVERSION}' \
+ -X 'gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v19/cmd.Commit=${GL_TAGNAME:C/^(........).*/\1/}' \
+ -X 'gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v19/cmd.BuildTime=${_BUILD_DATE}'"
PLIST_FILES= bin/kas
diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo
index c81d020edbec..10639534b070 100644
--- a/net/gitlab-agent/distinfo
+++ b/net/gitlab-agent/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1778734233
-SHA256 (go/net_gitlab-agent/gitlab-agent-v18.11.3/v18.11.3.mod) = 4852ac02fc2899bdf5b476b84f907b9bd7e0a6b43c872143037d0864b5302bb6
-SIZE (go/net_gitlab-agent/gitlab-agent-v18.11.3/v18.11.3.mod) = 9596
-SHA256 (go/net_gitlab-agent/gitlab-agent-v18.11.3/v18.11.3.zip) = b4142d6f3e2fd5cac8bf5e4dfbc49e99d769f7b41b9d1c278bc1b922ece3088f
-SIZE (go/net_gitlab-agent/gitlab-agent-v18.11.3/v18.11.3.zip) = 2068918
+TIMESTAMP = 1779350267
+SHA256 (go/net_gitlab-agent/gitlab-agent-v19.0.0/v19.0.0.mod) = bdb45b2c26fb7f4ee7e099c3e3c22a2c656d31099693709a5f775518fcdf8241
+SIZE (go/net_gitlab-agent/gitlab-agent-v19.0.0/v19.0.0.mod) = 9596
+SHA256 (go/net_gitlab-agent/gitlab-agent-v19.0.0/v19.0.0.zip) = f045c9ad8e85e867fc815f5453c1557aac38312048a3a94543a2d9e1d798c153
+SIZE (go/net_gitlab-agent/gitlab-agent-v19.0.0/v19.0.0.zip) = 2281724
diff --git a/net/rubygem-gitaly/Makefile b/net/rubygem-gitaly/Makefile
index 7a395879ea89..bbe7e6dada72 100644
--- a/net/rubygem-gitaly/Makefile
+++ b/net/rubygem-gitaly/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitaly
-PORTVERSION= 18.10.0
+PORTVERSION= 18.11.3
CATEGORIES= net rubygems
MASTER_SITES= RG
diff --git a/net/rubygem-gitaly/distinfo b/net/rubygem-gitaly/distinfo
index 37a1b28e0f47..73d9fd0c627e 100644
--- a/net/rubygem-gitaly/distinfo
+++ b/net/rubygem-gitaly/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1776335795
-SHA256 (rubygem/gitaly-18.10.0.gem) = 7b809d0ba1895983ac0bf55974183d8c1e7011214faa41e725e4b0bf455a89ec
-SIZE (rubygem/gitaly-18.10.0.gem) = 54784
+TIMESTAMP = 1779343369
+SHA256 (rubygem/gitaly-18.11.3.gem) = 4f0ba1e1c9af9aa84a5448688e41186fa694c53573a3c3db7635c055266dd177
+SIZE (rubygem/gitaly-18.11.3.gem) = 55296
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
index ef5e804d58be..557382b53687 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1778734235
-SHA256 (go/www_gitlab-pages/gitlab-pages-v18.11.3/go.mod) = f0ac1edc88b3e9d8008e61ec9827a74cd47c79068c8b44b7e673d11d128b804a
-SIZE (go/www_gitlab-pages/gitlab-pages-v18.11.3/go.mod) = 3987
-SHA256 (go/www_gitlab-pages/gitlab-pages-v18.11.3/gitlab-pages-v18.11.3.tar.bz2) = 6721716a5e4872cddbcfb34fca8a347e834a73093709bd775009e1ef65b25f7f
-SIZE (go/www_gitlab-pages/gitlab-pages-v18.11.3/gitlab-pages-v18.11.3.tar.bz2) = 240238
+TIMESTAMP = 1779350269
+SHA256 (go/www_gitlab-pages/gitlab-pages-v19.0.0/go.mod) = f0ac1edc88b3e9d8008e61ec9827a74cd47c79068c8b44b7e673d11d128b804a
+SIZE (go/www_gitlab-pages/gitlab-pages-v19.0.0/go.mod) = 3987
+SHA256 (go/www_gitlab-pages/gitlab-pages-v19.0.0/gitlab-pages-v19.0.0.tar.bz2) = 5717be430c894dcb12114cfcd046f0afaff7a9608d86e97c3324fc74f4719a23
+SIZE (go/www_gitlab-pages/gitlab-pages-v19.0.0/gitlab-pages-v19.0.0.tar.bz2) = 240283
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index 1f67cef7320b..c5401d3c056b 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1778734249
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.11.3/go.mod) = ac84781d3b95a273e771511035d5d7d62262d4237f9ed92882ac7dc09b2b93ef
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.11.3/go.mod) = 12631
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.11.3/gitlab-foss-v18.11.3.tar.bz2) = cdf0a392628b0deaa87255bace1e8a8d3b3ec5fe96d9821c45725b70c19a3ce1
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.11.3/gitlab-foss-v18.11.3.tar.bz2) = 134362593
+TIMESTAMP = 1779350289
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v19.0.0/go.mod) = ed54c70b31f9b41aab7fff255d250d722df351ad9676b559626bdfc07f242375
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v19.0.0/go.mod) = 12696
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v19.0.0/gitlab-foss-v19.0.0.tar.bz2) = c7f4aa63199d98c2c5f109c8c798133a14e7db62c1c78202cf0dde88b61a208f
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v19.0.0/gitlab-foss-v19.0.0.tar.bz2) = 136367989
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index 773104b418a4..4331b6f2c694 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -27,14 +27,16 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
# mail/rubygem-net-smtp is required as ruby 3.1 removed it
# textproc/rubygem-psych3 is required as ruby 3.1 applied an update to psych 4.0 which has breaking changes
# mail/rubygem-net-pop is required as ruby 3.1 removed it
+# rubygem-freezolite is required by bundled gem auto_freeze
+# rubygem-require-hooks is required by bundled gem auto_freeze
MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
- gitlab-elasticsearch-indexer>=5.13.3:textproc/gitlab-elasticsearch-indexer \
+ gitlab-elasticsearch-indexer>=5.14.7:textproc/gitlab-elasticsearch-indexer \
gitlab-agent>=${GITLAB_VERSION}:net/gitlab-agent \
gitlab-pages>=${GITLAB_VERSION}:www/gitlab-pages \
- gitlab-shell>=14.49.0:devel/gitlab-shell \
+ gitlab-shell>=14.51.0:devel/gitlab-shell \
gitlab-workhorse>=${GITLAB_VERSION}:www/gitlab-workhorse \
- gitlab-zoekt-indexer>=1.13.1:textproc/gitlab-zoekt-indexer \
- redis>=6.2.11:databases/redis \
+ gitlab-zoekt-indexer>=1.14.2:textproc/gitlab-zoekt-indexer \
+ redis>=7.2:databases/redis \
yarn${NODEJS_SUFFIX}>=1.10.0:www/yarn${NODEJS_SUFFIX} \
gtar>0:archivers/gtar \
bash>0:shells/bash \
@@ -45,8 +47,8 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-rails-gitlab>=${RAILS_VERSION}<7.3:www/rubygem-rails-gitlab \
rubygem-zeitwerk>=2.6.18<2.6.19:devel/rubygem-zeitwerk \
rubygem-drb-gitlab>=2.2.3<3:devel/rubygem-drb-gitlab \
- rubygem-bootsnap-gitlab>=1.23.0<1.24:devel/rubygem-bootsnap-gitlab \
- rubygem-ffi>=1.17.3<2:devel/rubygem-ffi \
+ rubygem-bootsnap-gitlab>=1.24.0<1.25:devel/rubygem-bootsnap-gitlab \
+ rubygem-ffi>=1.17.4<2:devel/rubygem-ffi \
rubygem-openssl3>=3.3.2<3.4:security/rubygem-openssl3 \
rubygem-gitlab-secret_detection>=0.40.0<1:security/rubygem-gitlab-secret_detection \
rubygem-responders-rails-gitlab>=3.0<4.0:www/rubygem-responders-rails-gitlab \
@@ -63,7 +65,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-devise-rails-gitlab>=4.9.3<4.10:devel/rubygem-devise-rails-gitlab \
rubygem-bcrypt>=3.1.22<3.2:security/rubygem-bcrypt \
rubygem-doorkeeper-rails-gitlab>=5.8.1<6:security/rubygem-doorkeeper-rails-gitlab \
- rubygem-doorkeeper-openid_connect>=1.8.11<2:security/rubygem-doorkeeper-openid_connect \
+ rubygem-doorkeeper-openid_connect>=1.9.0<1.10:security/rubygem-doorkeeper-openid_connect \
rubygem-doorkeeper-device_authorization_grant>=1.0.0<1.1:security/rubygem-doorkeeper-device_authorization_grant \
rubygem-rexml>=3.4.4<3.5:textproc/rubygem-rexml \
rubygem-ruby-saml-gitlab>=1.18.1<2:security/rubygem-ruby-saml-gitlab \
@@ -85,7 +87,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-recaptcha>=5.12<6.0:devel/rubygem-recaptcha \
rubygem-akismet>=3.0<4.0:devel/rubygem-akismet \
rubygem-invisible_captcha>=2.3.0<2.4:graphics/rubygem-invisible_captcha \
- rubygem-devise-two-factor-rails-gitlab>=5.1.0<5.2:security/rubygem-devise-two-factor-rails-gitlab \
+ rubygem-devise-two-factor-rails-gitlab>=6.4.0<6.5:security/rubygem-devise-two-factor-rails-gitlab \
rubygem-rqrcode-gitlab>=2.2.0<3:www/rubygem-rqrcode-gitlab \
rubygem-webauthn>=3.0<4:security/rubygem-webauthn \
rubygem-attr_encrypted>=4.2<5:security/rubygem-attr_encrypted \
@@ -103,7 +105,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-grape-swagger-entity>=0.7.1<0.8:devel/rubygem-grape-swagger-entity \
rubygem-grape-path-helpers>=2.0.1<2.1:devel/rubygem-grape-path-helpers \
rubygem-rack-cors>=2.0.1<2.1:www/rubygem-rack-cors \
- rubygem-graphql>=2.5.11<2.6:devel/rubygem-graphql \
+ rubygem-graphql>=2.5.23<2.5.24:devel/rubygem-graphql \
rubygem-apollo_upload_server>=2.1.8<2.2:net/rubygem-apollo_upload_server \
rubygem-ffaker>=2.25.0<3:devel/rubygem-ffaker \
rubygem-hashie-gitlab>=5.0.0<5.1:devel/rubygem-hashie-gitlab \
@@ -119,7 +121,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-fog-google-gitlab>=1.29.4<2:net/rubygem-fog-google-gitlab \
rubygem-fog-local-gitlab>=0.8<1.0:net/rubygem-fog-local-gitlab \
rubygem-fog-aliyun-gitlab>=0.4<1.0:net/rubygem-fog-aliyun-gitlab \
- rubygem-gitlab-fog-azure-rm>=2.4.0<2.5:net/rubygem-gitlab-fog-azure-rm \
+ rubygem-gitlab-fog-azure-rm>=2.5.0<2.6:net/rubygem-gitlab-fog-azure-rm \
rubygem-google-apis-storage_v1-gitlab>=0.29<1:devel/rubygem-google-apis-storage_v1-gitlab \
rubygem-google-cloud-storage-gitlab>=1.57.0<1.58:net/rubygem-google-cloud-storage-gitlab \
rubygem-google-apis-core-gitlab>=0.18.0<0.19:devel/rubygem-google-apis-core-gitlab \
@@ -163,11 +165,11 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-gitlab-glfm-markdown>=0.0.41<0.1:textproc/rubygem-gitlab-glfm-markdown \
rubygem-tanuki_emoji>=0.13<1:graphics/rubygem-tanuki_emoji \
rubygem-unicode-emoji>=4.0.4<5:devel/rubygem-unicode-emoji \
- rubygem-icalendar-gitlab>=2.10.3<2.11:devel/rubygem-icalendar-gitlab \
+ rubygem-icalendar-gitlab>=2.12.0<2.13:devel/rubygem-icalendar-gitlab \
rubygem-diffy>=3.4.4<4:textproc/rubygem-diffy \
rubygem-rack-gitlab>=2.2.23<2.3:www/rubygem-rack-gitlab \
rubygem-rack-timeout>=0.7.0<0.8:www/rubygem-rack-timeout \
- rubygem-puma-gitlab>=7.2<8:www/rubygem-puma-gitlab \
+ rubygem-puma-gitlab>=8.0<9:www/rubygem-puma-gitlab \
rubygem-sd_notify>=0.1.1<0.2:devel/rubygem-sd_notify \
rubygem-state_machines-activerecord-gitlab>=0.100.0<0.101.0:databases/rubygem-state_machines-activerecord-gitlab \
rubygem-sidekiq-gitlab>=7.3.9:devel/rubygem-sidekiq-gitlab \
@@ -182,8 +184,8 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-js_regex>=3.13.0<4.0:textproc/rubygem-js_regex \
rubygem-device_detector>=1.1.3:devel/rubygem-device_detector \
rubygem-redis-gitlab>=5.4.1<5.5:databases/rubygem-redis-gitlab \
- rubygem-redis-client>=0.26.4<1:databases/rubygem-redis-client \
- rubygem-redis-cluster-client>=0.13.5<1:databases/rubygem-redis-cluster-client \
+ rubygem-redis-client>=0.28.0<1:databases/rubygem-redis-client \
+ rubygem-redis-cluster-client>=0.15.0<1:databases/rubygem-redis-cluster-client \
rubygem-redis-clustering-gitlab>=5.4.1<5.5:databases/rubygem-redis-clustering-gitlab \
rubygem-connection_pool-gitlab>=2.5.5<2.6:net/rubygem-connection_pool-gitlab \
rubygem-redis-actionpack-rails-gitlab>=5.5.0<5.6:databases/rubygem-redis-actionpack-rails-gitlab \
@@ -196,8 +198,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-sanitize60>=6.0.2<6.1:textproc/rubygem-sanitize60 \
rubygem-babosa>=2.0<3:textproc/rubygem-babosa \
rubygem-loofah-gitlab>=2.25.1<2.26:textproc/rubygem-loofah-gitlab \
- rubygem-licensee-gitlab>=9.16<10:devel/rubygem-licensee-gitlab \
- rubygem-rugged17>=1.7.2<1.8:devel/rubygem-rugged17 \
+ rubygem-licensee-gitlab>=10.0.0<11:devel/rubygem-licensee-gitlab \
rubygem-charlock_holmes>=0.7.9<0.8:textproc/rubygem-charlock_holmes \
rubygem-ruby-magic>=0.6<1:devel/rubygem-ruby-magic \
rubygem-fast_blank>=1.0.1<1.1:devel/rubygem-fast_blank \
@@ -218,7 +219,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-sentry-sidekiq>=5.23.0<5.24:devel/rubygem-sentry-sidekiq \
rubygem-pg_query>=6.2.2<6.3:databases/rubygem-pg_query \
rubygem-premailer-rails-rails-gitlab>=1.12.0<1.13:mail/rubygem-premailer-rails-rails-gitlab \
- rubygem-gitlab-labkit>=1.5.1<1.6:devel/rubygem-gitlab-labkit \
+ rubygem-gitlab-labkit>=2.0.0<2.1:devel/rubygem-gitlab-labkit \
rubygem-thrift>=0.22.0,1<0.23,1:devel/rubygem-thrift \
rubygem-rails-i18n-rails-gitlab>=7.0.9<8:devel/rubygem-rails-i18n-rails-gitlab \
rubygem-gettext_i18n_rails>=1.13.0<1.14:devel/rubygem-gettext_i18n_rails \
@@ -229,7 +230,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-snowplow-tracker>=0.8.0<1:devel/rubygem-snowplow-tracker \
rubygem-webrick>=1.9.0<1.10:www/rubygem-webrick \
rubygem-prometheus-client-mmap>=1.5.0<1.6:devel/rubygem-prometheus-client-mmap \
- rubygem-async-gitlab>=2.32.0<2.33:devel/rubygem-async-gitlab \
+ rubygem-async-gitlab>=2.39.0<2.40:devel/rubygem-async-gitlab \
rubygem-io-event-gitlab>=1.14.5<2:devel/rubygem-io-event-gitlab \
rubygem-gitlab-security_report_schemas>=0.2.0.min15.0.0.max15.2.4<0.2.0.min15.0.0.max15.2.5:devel/rubygem-gitlab-security_report_schemas \
rubygem-vite_rails-gitlab>=3.10.0<3.11:devel/rubygem-vite_rails-gitlab \
@@ -260,8 +261,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-opentelemetry-instrumentation-sidekiq-gitlab>=0.28.1:devel/rubygem-opentelemetry-instrumentation-sidekiq-gitlab \
rubygem-warning>=1.5.0<1.6:devel/rubygem-warning \
rubygem-git>=1.19.1<2:devel/rubygem-git \
- rubygem-gitlab-dangerfiles>=4.10.0<4.11:devel/rubygem-gitlab-dangerfiles \
- rubygem-license_finder-gitlab>=7.2.1<8:devel/rubygem-license_finder-gitlab \
+ rubygem-gitlab-dangerfiles>=4.11.1<4.12:devel/rubygem-gitlab-dangerfiles \
rubygem-rspec>=3.0<4:devel/rubygem-rspec \
rubygem-octokit-gitlab>=9.0<10:net/rubygem-octokit-gitlab \
rubygem-faraday-multipart>=1.1.1<2:www/rubygem-faraday-multipart \
@@ -271,18 +271,18 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-stackprof>=0.2.28<0.3:devel/rubygem-stackprof \
rubygem-rbtrace>=0.5.3<1.0:devel/rubygem-rbtrace \
rubygem-memory_profiler>=1.1.0<2.0:devel/rubygem-memory_profiler \
- rubygem-oauth2-gitlab>=2.0.10<3:net/rubygem-oauth2-gitlab \
+ rubygem-oauth2-gitlab>=2.0.18<3:net/rubygem-oauth2-gitlab \
rubygem-health_check-rails-gitlab>=3.0<4:devel/rubygem-health_check-rails-gitlab \
rubygem-vmstat>=2.3.1<2.4.0:sysutils/rubygem-vmstat \
- rubygem-sys-filesystem14>=1.4.3<1.5:sysutils/rubygem-sys-filesystem14 \
+ rubygem-sys-filesystem>=1.5.5<1.6:sysutils/rubygem-sys-filesystem \
rubygem-net-ntp>0:net/rubygem-net-ntp \
rubygem-ssh_data>=2.0<3:security/rubygem-ssh_data \
rubygem-spamcheck>=1.3.3<1.4:net/rubygem-spamcheck \
- rubygem-gitaly>=18.10.0:net/rubygem-gitaly \
+ rubygem-gitaly>=18.11.0:net/rubygem-gitaly \
rubygem-gitlab-kas-grpc>=${GITLAB_KAS_GRPC_VERSION}:net/rubygem-gitlab-kas-grpc \
- rubygem-gitlab-gkg-proto>=0.7.0<0.8:net/rubygem-gitlab-gkg-proto \
+ rubygem-gitlab-gkg-proto>=0.37.0<0.38:net/rubygem-gitlab-gkg-proto \
rubygem-grpc-gitlab>=1.80.0<1.81:net/rubygem-grpc-gitlab \
- rubygem-google-protobuf>=3.25.8<5:devel/rubygem-google-protobuf \
+ rubygem-google-protobuf>=4.34.1<5:devel/rubygem-google-protobuf \
rubygem-toml-rb>=4.1<5:www/rubygem-toml-rb \
rubygem-flipper-gitlab>=1.3.6<1.4:devel/rubygem-flipper-gitlab \
rubygem-flipper-active_record-rails-gitlab>=1.3.6<1.4:databases/rubygem-flipper-active_record-rails-gitlab \
@@ -311,7 +311,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-ed25519>=1.4.0<1.5:security/rubygem-ed25519 \
rubygem-cvss-suite>=4.1.2<4.2:security/rubygem-cvss-suite \
rubygem-arr-pm>=0.0.12<0.1:devel/rubygem-arr-pm \
- rubygem-devfile>=0.5.0<0.6:net/rubygem-devfile \
+ rubygem-devfile>=0.5.1<0.6:net/rubygem-devfile \
rubygem-hashdiff>=1.2.1<1.3:devel/rubygem-hashdiff \
rubygem-CFPropertyList-gitlab>=3.0.7<3.1:devel/rubygem-CFPropertyList-gitlab \
rubygem-app_store_connect>=0:net/rubygem-app_store_connect \
@@ -327,14 +327,18 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-i18n_data>=0.13.1<1:devel/rubygem-i18n_data \
rubygem-gitlab-cloud-connector>=1.46<2:security/rubygem-gitlab-cloud-connector \
rubygem-gvltools>=0.4.0<0.5:devel/rubygem-gvltools \
- rubygem-gitlab_query_language>=0.26.0<0.27:devel/rubygem-gitlab_query_language \
+ rubygem-gitlab_query_language>=0.27.1<0.28:devel/rubygem-gitlab_query_language \
+ rubygem-zlib>=3.2.3<3.3:devel/rubygem-zlib \
+ rubygem-license_finder-gitlab>=7.2.1<8:devel/rubygem-license_finder-gitlab \
rubygem-google-cloud-profiler-v2>=0.3<1:textproc/rubygem-google-cloud-profiler-v2 \
rubygem-parallel>=1.27.0<2:sysutils/rubygem-parallel \
rubygem-google-cloud-storage_transfer-gitlab>=1.2.0<1.3:net/rubygem-google-cloud-storage_transfer-gitlab \
rubygem-minitest>=5.11<6:devel/rubygem-minitest \
rubygem-grpc-tools>=1.69.0<1.70:net/rubygem-grpc-tools \
rubygem-opensearch-ruby-gitlab>=0:textproc/rubygem-opensearch-ruby-gitlab \
- rubygem-bigdecimal-gitlab>=3.1<4:math/rubygem-bigdecimal-gitlab
+ rubygem-bigdecimal-gitlab>=3.3.1<4:math/rubygem-bigdecimal-gitlab \
+ rubygem-freezolite>=0.6<1:devel/rubygem-freezolite \
+ rubygem-require-hooks>=0.2.3<0.3:devel/rubygem-require-hooks
BUILD_DEPENDS= gem:devel/ruby-gems \
${MY_DEPENDS}
@@ -481,6 +485,8 @@ post-install:
@${ECHO_CMD} "@dir ${WWWDIR_REL}/config" >> ${TMPPLIST}
@${ECHO_CMD} "@dir(git,git,755) ${WWWDIR_REL}/config/helpers/tailwind" >> ${TMPPLIST}
@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/builds" >> ${TMPPLIST}
+ @${ECHO_CMD} "@dir(,,755) ${WWWDIR_REL}/doc-locale/fr-fr/.vale/locale_rules" >> ${TMPPLIST}
+ @${ECHO_CMD} "@dir(,,755) ${WWWDIR_REL}/doc-locale/ko-kr/.vale/locale_rules" >> ${TMPPLIST}
@${ECHO_CMD} "@dir(git,git,750) ${WWWDIR_REL}/gems/gitlab-backup-cli/tmp" >> ${TMPPLIST}
@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale" >> ${TMPPLIST}
@${ECHO_CMD} "@dir ${WWWDIR_REL}/lib/assets" >> ${TMPPLIST}
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index 0a21c2da91f2..f568db06dbce 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,4 +1,4 @@
-GITLAB_VERSION= 18.11.3
+GITLAB_VERSION= 19.0.0
GITLAB_PORTREVISION= 7 # decrease this only if GITLAB_KAS_GRPC_VERSION is upgraded
# Git version gitaly should use (from gitlab mirror)
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index 41786733b562..2392352bc1f6 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1778734172
-SHA256 (gitlab-foss-v18.11.3.tar.bz2) = cdf0a392628b0deaa87255bace1e8a8d3b3ec5fe96d9821c45725b70c19a3ce1
-SIZE (gitlab-foss-v18.11.3.tar.bz2) = 134362593
-TIMESTAMP = 1778734224
-SHA256 (gitlab-v18.11.3-ee.tar.bz2) = 2e2e6036928bb3ef5714fc6d9bbb9cb6e721db502005f14120b4f72925cb1134
-SIZE (gitlab-v18.11.3-ee.tar.bz2) = 153159410
+TIMESTAMP = 1779350249
+SHA256 (gitlab-foss-v19.0.0.tar.bz2) = c7f4aa63199d98c2c5f109c8c798133a14e7db62c1c78202cf0dde88b61a208f
+SIZE (gitlab-foss-v19.0.0.tar.bz2) = 136367989
+TIMESTAMP = 1779350250
+SHA256 (gitlab-v19.0.0-ee.tar.bz2) = e4d025080dab1fc9075c031cef3190c1ecd7bfc3e38e78b5fd893ae5f295c53c
+SIZE (gitlab-v19.0.0-ee.tar.bz2) = 155500582
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index 26fd1e56cd41..f66600994e12 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,15 +1,15 @@
---- Gemfile.orig 2026-04-15 21:42:44 UTC
+--- Gemfile.orig 2026-05-21 00:30:40 UTC
+++ Gemfile
-@@ -167,7 +167,7 @@ gem 'graphql', '2.5.11', feature_category: :api
+@@ -158,7 +158,7 @@ gem 'graphql', '2.5.23', feature_category: :api
# GraphQL API
- gem 'graphql', '2.5.11', feature_category: :api
+ gem 'graphql', '2.5.23', feature_category: :api
-gem 'graphql-docs', '~> 5.2.0', group: [:development, :test], feature_category: :api
+#gem 'graphql-docs', '~> 5.2.0', group: [:development, :test], feature_category: :api
gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api
# Cells
-@@ -296,7 +296,7 @@ gem 'state_machines-activerecord', '~> 0.100.0', featu
+@@ -287,7 +287,7 @@ gem 'state_machines-activerecord', '~> 0.100.0', featu
gem 'state_machines-activerecord', '~> 0.100.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
# Background jobs
@@ -18,7 +18,7 @@
gem 'sidekiq-cron', '~> 2.3.0', feature_category: :scalability
gem 'gitlab-sidekiq-fetcher',
path: 'vendor/gems/sidekiq-reliable-fetch',
-@@ -476,136 +476,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared #
+@@ -467,123 +467,6 @@ gem 'warning', '~> 1.5.0', feature_category: :shared #
gem 'warning', '~> 1.5.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
@@ -27,7 +27,7 @@
- gem 'rubocop', feature_category: :tooling, require: false
- gem 'debug', '~> 1.11.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
-
-- gem 'solargraph', '~> 0.54.0', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+- gem 'solargraph', '~> 0.58.0', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
- gem 'solargraph-rspec', '~> 0.5.1', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
-
- gem 'letter_opener_web', '~> 3.0.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
@@ -48,7 +48,8 @@
- # Used by
- # * `lib/tasks/gitlab/security/update_banned_ssh_keys.rake`
- # * `lib/tasks/gitlab/db/migration_squash.rake`
-- gem 'git', '~> 1.8', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+- # * `lib/gitlab/diff/diff_refs.rb`
+- gem 'git', '~> 1.8', feature_category: :source_code_management
-end
-
-group :development, :test do
@@ -70,7 +71,7 @@
- gem 'spring', '~> 4.3.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
- gem 'spring-commands-rspec', '~> 1.0.4', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
-
-- gem 'gitlab-styles', '~> 13.1.0', feature_category: :tooling, require: false
+- gem 'gitlab-styles', '~> 14.0', feature_category: :tooling, require: false
- gem 'haml_lint', '~> 0.58', feature_category: :tooling, require: false
-
- # Benchmarking & profiling
@@ -94,26 +95,17 @@
- gem 'gitlab-housekeeper', path: 'gems/gitlab-housekeeper', feature_category: :tooling
-
- gem 'yard', '~> 0.9', require: false, feature_category: :tooling
--end
-
- group :development, :test, :danger do
- gem 'gitlab-dangerfiles', '~> 4.10.0', require: false, feature_category: :tooling
- end
-
--group :development, :test, :coverage do
+- # Gems required for Dangerfile
+- gem 'gitlab-dangerfiles', '~> 4.11.1', require: false, feature_category: :tooling
+-
+- # Gems required for code coverage
- gem 'simplecov', '~> 0.22', require: false, feature_category: :tooling
- gem 'simplecov-lcov', '~> 0.8.0', require: false, feature_category: :tooling
- gem 'simplecov-cobertura', '~> 3.1.0', require: false, feature_category: :tooling
- gem 'undercover', '~> 0.8.0', require: false, feature_category: :tooling
--end
-
- # Gems required in omnibus-gitlab pipeline
- group :development, :test, :omnibus do
- gem 'license_finder', '~> 7.0', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
- end
-
--# Gems required in various pipelines
--group :development, :test, :monorepo do
+- # Gems required in various pipelines
- gem 'gitlab-rspec', path: 'gems/gitlab-rspec', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
- gem 'gitlab-rspec_flaky', path: 'gems/gitlab-rspec_flaky', feature_category: :tooling
-end
@@ -130,11 +122,6 @@
-
- gem 'graphlyte', '~> 1.0.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
-
-- # Upload CI metrics to a GCP BigQuery instance
-- #
-- # We only use this gem in CI.
-- gem 'google-cloud-bigquery', '~> 1.0', feature_category: :tooling
--
- gem 'shoulda-matchers', '~> 6.4.0', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
- gem 'email_spec', '~> 2.3.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
- gem 'webmock', '~> 3.26.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
@@ -149,22 +136,22 @@
- # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
- gem 'derailed_benchmarks', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
-
-- gem 'gitlab_quality-test_tooling', '~> 3.10.0', require: false, feature_category: :tooling
+- gem 'gitlab_quality-test_tooling', '~> 3.14.0', require: false, feature_category: :tooling
-end
-
gem 'octokit', '~> 9.0', feature_category: :importers
# Needed by octokit: https://github.com/octokit/octokit.rb/pull/1688
gem 'faraday-multipart', '~> 1.0', feature_category: :importers
-@@ -642,7 +521,7 @@ gem 'gitaly', '~> 18.10.0', feature_category: :gitaly
- gem 'gitaly', '~> 18.10.0', feature_category: :gitaly
+@@ -620,7 +503,7 @@ gem 'gitaly', '~> 18.11.0', feature_category: :gitaly
+ gem 'gitaly', '~> 18.11.0', feature_category: :gitaly
# KAS GRPC protocol definitions
-gem 'gitlab-kas-grpc', '~> 18.5.0-rc4', feature_category: :deployment_management
+gem 'gitlab-kas-grpc', '~> 18.5.2', feature_category: :deployment_management
# Knowledge Graph GRPC protocol definitions
- gem 'gitlab-gkg-proto', '~> 0.7.0', feature_category: :knowledge_graph
-@@ -668,7 +547,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :
+ gem 'gitlab-gkg-proto', '~> 0.37.0', feature_category: :knowledge_graph
+@@ -646,7 +529,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :
gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
# Countries list
@@ -173,7 +160,7 @@
gem 'retriable', '~> 3.1.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
-@@ -749,11 +628,16 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
+@@ -727,11 +610,16 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
gem 'duo_api', '~> 1.3', feature_category: :system_access
@@ -191,3 +178,8 @@
gem "gitlab-cloud-connector", "~> 1.45", require: 'gitlab/cloud_connector', feature_category: :plan_provisioning
+@@ -744,3 +632,4 @@ gem 'license_finder', '~> 7.0', require: false, featur
+
+ # Gems required in omnibus-gitlab pipeline
+ gem 'license_finder', '~> 7.0', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
++gem 'gitlab-dangerfiles', '~> 4.11.1', require: false, feature_category: :tooling
diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example
index c16c208783c7..7a71dea0144e 100644
--- a/www/gitlab/files/patch-config_gitlab.yml.example
+++ b/www/gitlab/files/patch-config_gitlab.yml.example
@@ -1,6 +1,6 @@
---- config/gitlab.yml.example.orig 2026-04-15 21:42:44 UTC
+--- config/gitlab.yml.example.orig 2026-05-21 00:30:40 UTC
+++ config/gitlab.yml.example
-@@ -567,7 +567,7 @@ production: &base
+@@ -579,7 +579,7 @@ production: &base
## GitLab Pages
pages:
enabled: false
@@ -9,7 +9,7 @@
# The location where pages are stored (default: shared/pages).
# path: shared/pages
-@@ -1342,7 +1342,7 @@ production: &base
+@@ -1354,7 +1354,7 @@ production: &base
repositories:
storages: # You must have at least a `default` storage path.
default:
@@ -18,7 +18,7 @@
# For DNS-based load balancing with TLS, use: dns+tls://[authority_host]:[authority_port]/[host]:[port]
# The host:port portion will be used as the TLS server name for SNI.
# Example: dns+tls://1.1.1.1/gitaly.example.com:8075
-@@ -1351,7 +1351,7 @@ production: &base
+@@ -1363,7 +1363,7 @@ production: &base
## Backup settings
backup:
path: "tmp/backups" # Relative paths are relative to Rails.root (default: tmp/backups/)
@@ -27,7 +27,7 @@
# archive_permissions: 0640 # Permissions for the resulting backup.tar file (default: 0600)
# keep_time: 604800 # default: 0 (forever) (in seconds)
# pg_schema: public # default: nil, it means that all schemas will be backed up
-@@ -1386,12 +1386,12 @@ production: &base
+@@ -1398,12 +1398,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@@ -43,7 +43,7 @@
# Git over HTTP
upload_pack: true
-@@ -1406,7 +1406,7 @@ production: &base
+@@ -1418,7 +1418,7 @@ production: &base
workhorse:
# File that contains the secret key for verifying access for gitlab-workhorse.
# Default is '.gitlab_workhorse_secret' relative to Rails.root (i.e. root of the GitLab app).
@@ -52,7 +52,7 @@
database_traffic_capture:
config:
-@@ -1432,7 +1432,7 @@ production: &base
+@@ -1444,7 +1444,7 @@ production: &base
# enabled: true
# File that contains the secret key for verifying access for gitlab-kas.
# Default is '.gitlab_kas_secret' relative to Rails.root (i.e. root of the GitLab app).
@@ -61,7 +61,7 @@
# The URL to the external KAS API (used by the Kubernetes agents)
# external_url: wss://kas.example.com
-@@ -1453,13 +1453,13 @@ production: &base
+@@ -1465,13 +1465,13 @@ production: &base
## GitLab Elasticsearch settings
elasticsearch:
@@ -77,7 +77,7 @@
## Webpack settings
# If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
-@@ -1480,18 +1480,18 @@ production: &base
+@@ -1492,18 +1492,18 @@ production: &base
# Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq.
sidekiq_exporter:
@@ -103,7 +103,7 @@
# Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma.
web_exporter:
-@@ -1729,13 +1729,13 @@ test:
+@@ -1752,13 +1752,13 @@ test:
gitaly_address: unix:tmp/tests/gitaly/praefect.socket
gitaly: