Date: Fri, 27 Feb 2026 12:18:35 +0000 From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: ca232d238ac7 - 2026Q1 - www/gitlab: major update to 18.9.0 Message-ID: <69a18b9b.3f254.41cfff6f@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch 2026Q1 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=ca232d238ac7e0343ed5290577172f638fa2e38d commit ca232d238ac7e0343ed5290577172f638fa2e38d Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2026-02-20 17:12:29 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2026-02-27 12:07:51 +0000 www/gitlab: major update to 18.9.0 Changes: https://about.gitlab.com/releases/2026/02/19/gitlab-18-9-released/ (cherry picked from commit d0eb3886e69928487828c93a065ecd6e2bffd764) --- devel/gitaly/Makefile | 1 + devel/gitaly/distinfo | 26 +++++------ devel/gitlab-shell/Makefile | 3 +- devel/gitlab-shell/distinfo | 10 ++--- net/gitlab-agent/distinfo | 10 ++--- net/rubygem-gitaly/Makefile | 2 +- net/rubygem-gitaly/distinfo | 6 +-- www/gitlab-pages/distinfo | 10 ++--- www/gitlab-workhorse/distinfo | 10 ++--- www/gitlab/Makefile | 57 ++++++++++++------------ www/gitlab/Makefile.common | 6 +-- www/gitlab/distinfo | 12 ++--- www/gitlab/files/patch-Gemfile | 26 +++++------ www/gitlab/files/patch-config_gitlab.yml.example | 24 +++++----- www/gitlab/files/patch-package.json | 4 +- www/gitlab/pkg-message | 4 +- 16 files changed, 106 insertions(+), 105 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index f8362813adf7..3a65be57df80 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -17,6 +17,7 @@ BROKEN_i386= Platform i386 is not supported upstream, see https://gitlab.com/git BUILD_DEPENDS= bash>0:shells/bash \ ${LOCALBASE}/bin/cmake:devel/cmake-core \ + meson:devel/meson \ pcre2>0:devel/pcre2 \ http-parser>0:www/http-parser LIB_DEPENDS= libcurl.so:ftp/curl \ diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index 34bcc44797b0..40ed3bb2274c 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,13 +1,13 @@ -TIMESTAMP = 1770744391 -SHA256 (go/devel_gitaly/gitaly-v18.8.4/go.mod) = bf373eee468af0e57c7816ba015809f29f09dcd7822f6f2573afac4a15664219 -SIZE (go/devel_gitaly/gitaly-v18.8.4/go.mod) = 14016 -SHA256 (go/devel_gitaly/gitaly-v18.8.4/gitaly-v18.8.4.tar.bz2) = dca70b4ef422fed5aba158b50ad15eee6ca1e03ea8a36794ab229dd29df9439e -SIZE (go/devel_gitaly/gitaly-v18.8.4/gitaly-v18.8.4.tar.bz2) = 4670097 -SHA256 (go/devel_gitaly/gitaly-v18.8.4/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4 -SIZE (go/devel_gitaly/gitaly-v18.8.4/git-v2.50.0.tar.bz2) = 9249878 -SHA256 (go/devel_gitaly/gitaly-v18.8.4/gitlab-org-git-aea8cc3a10c325a22a75e2d4f582db959d3854ae_GL0.tar.gz) = d7cb6a43a72e1ebe2369964727a0dfc55ce07bde0214703ed6c156127bb51889 -SIZE (go/devel_gitaly/gitaly-v18.8.4/gitlab-org-git-aea8cc3a10c325a22a75e2d4f582db959d3854ae_GL0.tar.gz) = 11920888 -SHA256 (go/devel_gitaly/gitaly-v18.8.4/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = d3397b210ca156ed84ff69b3a7f6316c5026bd05d11455f23d8335473dceaf1b -SIZE (go/devel_gitaly/gitaly-v18.8.4/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = 11822923 -SHA256 (go/devel_gitaly/gitaly-v18.8.4/8309.patch) = 90377ee1d14ec92e69dd97ad6d7c1d2bcce1c05fdf6095f04d51780b22cd65c7 -SIZE (go/devel_gitaly/gitaly-v18.8.4/8309.patch) = 1285 +TIMESTAMP = 1771570105 +SHA256 (go/devel_gitaly/gitaly-v18.9.0/go.mod) = 84778c06eba46e5d5dc3749aed3bff7868dd14d64d203be2f4289d5fa6f9c843 +SIZE (go/devel_gitaly/gitaly-v18.9.0/go.mod) = 13804 +SHA256 (go/devel_gitaly/gitaly-v18.9.0/gitaly-v18.9.0.tar.bz2) = 53bdc9671c4dccc027ca15b210633e8fca20e0412eb9ecf62be24e17f96920e2 +SIZE (go/devel_gitaly/gitaly-v18.9.0/gitaly-v18.9.0.tar.bz2) = 4654658 +SHA256 (go/devel_gitaly/gitaly-v18.9.0/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4 +SIZE (go/devel_gitaly/gitaly-v18.9.0/git-v2.50.0.tar.bz2) = 9249878 +SHA256 (go/devel_gitaly/gitaly-v18.9.0/gitlab-org-git-83a69f19359e6d9bc980563caca38b2b5729808c_GL0.tar.gz) = c0a106abff03bd587f4f4060e6ea8d85b5a282466da2e01d6e6002068e45a0a3 +SIZE (go/devel_gitaly/gitaly-v18.9.0/gitlab-org-git-83a69f19359e6d9bc980563caca38b2b5729808c_GL0.tar.gz) = 11946944 +SHA256 (go/devel_gitaly/gitaly-v18.9.0/gitlab-org-git-aea8cc3a10c325a22a75e2d4f582db959d3854ae_GL0.tar.gz) = d7cb6a43a72e1ebe2369964727a0dfc55ce07bde0214703ed6c156127bb51889 +SIZE (go/devel_gitaly/gitaly-v18.9.0/gitlab-org-git-aea8cc3a10c325a22a75e2d4f582db959d3854ae_GL0.tar.gz) = 11920888 +SHA256 (go/devel_gitaly/gitaly-v18.9.0/8309.patch) = 90377ee1d14ec92e69dd97ad6d7c1d2bcce1c05fdf6095f04d51780b22cd65c7 +SIZE (go/devel_gitaly/gitaly-v18.9.0/8309.patch) = 1285 diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile index fd283c6eb231..40e8054403cb 100644 --- a/devel/gitlab-shell/Makefile +++ b/devel/gitlab-shell/Makefile @@ -1,7 +1,6 @@ PORTNAME= gitlab-shell -PORTVERSION= 14.45.5 +PORTVERSION= 14.45.6 DISTVERSIONPREFIX= v -PORTREVISION= 2 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org diff --git a/devel/gitlab-shell/distinfo b/devel/gitlab-shell/distinfo index d3bb8baf2431..8bec2e81519e 100644 --- a/devel/gitlab-shell/distinfo +++ b/devel/gitlab-shell/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1766204661 -SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.45.5/go.mod) = 721ad47689938dda2e70718ff011edf163c71d22a8abd23603b0dcc44bdb4aa4 -SIZE (go/devel_gitlab-shell/gitlab-shell-v14.45.5/go.mod) = 6035 -SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.45.5/gitlab-shell-v14.45.5.tar.bz2) = 457c6da45982b647bb18544cd48e9c375fe95589d1ca6a3ea2df8c360a489845 -SIZE (go/devel_gitlab-shell/gitlab-shell-v14.45.5/gitlab-shell-v14.45.5.tar.bz2) = 173284 +TIMESTAMP = 1771566621 +SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.45.6/go.mod) = 7431451ca42d6a9a893605649f10d1df56e4ab2cfb42194a5a8444fa4a797a9c +SIZE (go/devel_gitlab-shell/gitlab-shell-v14.45.6/go.mod) = 6035 +SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.45.6/gitlab-shell-v14.45.6.tar.bz2) = 3c089a4156d1fc3a749314377cab89b84b487a27447477c3041b3be1190f0be4 +SIZE (go/devel_gitlab-shell/gitlab-shell-v14.45.6/gitlab-shell-v14.45.6.tar.bz2) = 173198 diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo index d378ff4e456e..c4a1aac6ebdc 100644 --- a/net/gitlab-agent/distinfo +++ b/net/gitlab-agent/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1770744394 -SHA256 (go/net_gitlab-agent/gitlab-agent-v18.8.4/v18.8.4.mod) = c73014e839dd525bdc8be99cf243eba6375af8846617eae3a40d2418816a410b -SIZE (go/net_gitlab-agent/gitlab-agent-v18.8.4/v18.8.4.mod) = 9374 -SHA256 (go/net_gitlab-agent/gitlab-agent-v18.8.4/v18.8.4.zip) = d5f1b9d53126b4505ea3c5c6189773d76f0fae9719611a639d645a3ae2cd0fb3 -SIZE (go/net_gitlab-agent/gitlab-agent-v18.8.4/v18.8.4.zip) = 1869257 +TIMESTAMP = 1771566466 +SHA256 (go/net_gitlab-agent/gitlab-agent-v18.9.0/v18.9.0.mod) = 120b313b3197413e9833596ba0377d0fc1126717bd0b3bf407d5b50f2d9a46a1 +SIZE (go/net_gitlab-agent/gitlab-agent-v18.9.0/v18.9.0.mod) = 9324 +SHA256 (go/net_gitlab-agent/gitlab-agent-v18.9.0/v18.9.0.zip) = 8113f51864b44a7839f1d279c61b7622b5bb554fb173f155d4f43472d3268492 +SIZE (go/net_gitlab-agent/gitlab-agent-v18.9.0/v18.9.0.zip) = 1887885 diff --git a/net/rubygem-gitaly/Makefile b/net/rubygem-gitaly/Makefile index 75832f28319f..0c3efa303c1e 100644 --- a/net/rubygem-gitaly/Makefile +++ b/net/rubygem-gitaly/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitaly -PORTVERSION= 18.7.0 +PORTVERSION= 18.8.4 CATEGORIES= net rubygems MASTER_SITES= RG diff --git a/net/rubygem-gitaly/distinfo b/net/rubygem-gitaly/distinfo index 37ffb8468179..bd94b8002519 100644 --- a/net/rubygem-gitaly/distinfo +++ b/net/rubygem-gitaly/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1766207311 -SHA256 (rubygem/gitaly-18.7.0.gem) = 915f0d1b078f2eac89390f1c2083b72434f51cd00c428006e231df25b19a6b4e -SIZE (rubygem/gitaly-18.7.0.gem) = 54272 +TIMESTAMP = 1771568601 +SHA256 (rubygem/gitaly-18.8.4.gem) = 08e8ed358ef82dc5ac88b89b548469e395ef90a55b5daf4ecfa5bc52804a3efb +SIZE (rubygem/gitaly-18.8.4.gem) = 54272 diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo index 44a763fc61ce..e5e4f870b9cc 100644 --- a/www/gitlab-pages/distinfo +++ b/www/gitlab-pages/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1770744398 -SHA256 (go/www_gitlab-pages/gitlab-pages-v18.8.4/go.mod) = 8bc5ad61abb3a5a6d07a64652460587511671a82c104cf5997806b5d609a8dd6 -SIZE (go/www_gitlab-pages/gitlab-pages-v18.8.4/go.mod) = 3523 -SHA256 (go/www_gitlab-pages/gitlab-pages-v18.8.4/gitlab-pages-v18.8.4.tar.bz2) = c77cbff781ce73462b28f5b4941645ce69d010515042c8894f856797c6579e74 -SIZE (go/www_gitlab-pages/gitlab-pages-v18.8.4/gitlab-pages-v18.8.4.tar.bz2) = 238012 +TIMESTAMP = 1771566468 +SHA256 (go/www_gitlab-pages/gitlab-pages-v18.9.0/go.mod) = 8bc5ad61abb3a5a6d07a64652460587511671a82c104cf5997806b5d609a8dd6 +SIZE (go/www_gitlab-pages/gitlab-pages-v18.9.0/go.mod) = 3523 +SHA256 (go/www_gitlab-pages/gitlab-pages-v18.9.0/gitlab-pages-v18.9.0.tar.bz2) = 9637057a716ec65093a921c6bc5f0c60b4ffc0d43669b5e52de57a458c4e75fa +SIZE (go/www_gitlab-pages/gitlab-pages-v18.9.0/gitlab-pages-v18.9.0.tar.bz2) = 237958 diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index 57e0fd3b8e01..7db736ec0399 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1770744420 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.8.4/go.mod) = dd3a4f3dae583fc4c00686c61fa6033d1c9b99e428f29c79a022ee39a4692ada -SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.8.4/go.mod) = 9356 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.8.4/gitlab-foss-v18.8.4.tar.bz2) = 6aa293135bd6a752fbff65b0be8642ce5f79109d1f538b84f9f32e385951312c -SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.8.4/gitlab-foss-v18.8.4.tar.bz2) = 130769049 +TIMESTAMP = 1771566506 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.9.0/go.mod) = 48c3fe49bf02168a521eea8722a662c70ca6c76a711db8251ce9d2db2d11fc04 +SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.9.0/go.mod) = 10249 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.9.0/gitlab-foss-v18.9.0.tar.bz2) = 130bb745692b34e424dd127e7630c8c6de6ae7de5a5bbb2515e2c7bfdefaa7c3 +SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.9.0/gitlab-foss-v18.9.0.tar.bz2) = 132341102 diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 57043d3a7074..e616015b98b5 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -31,17 +31,17 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # Gitlab does not work with nodejs 24, but keep it here for a later upgrade # yarn${NODEJS_SUFFIX}>=1.10.0:www/yarn${NODEJS_SUFFIX} MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ - gitlab-elasticsearch-indexer>=5.12.2:textproc/gitlab-elasticsearch-indexer \ + gitlab-elasticsearch-indexer>=5.13.3:textproc/gitlab-elasticsearch-indexer \ gitlab-agent>=${GITLAB_VERSION}:net/gitlab-agent \ gitlab-pages>=${GITLAB_VERSION}:www/gitlab-pages \ - gitlab-shell>=14.45.5:devel/gitlab-shell \ + gitlab-shell>=14.45.6:devel/gitlab-shell \ gitlab-workhorse>=${GITLAB_VERSION}:www/gitlab-workhorse \ gitlab-zoekt-indexer>=1.8.0:textproc/gitlab-zoekt-indexer \ redis>=6.2.11:databases/redis \ yarn-node20>=1.10.0:www/yarn-node20 \ gtar>0:archivers/gtar \ bash>0:shells/bash \ - rubygem-parser>=3.3.10.0:devel/rubygem-parser \ + rubygem-parser>=3.3.10.1:devel/rubygem-parser \ rubygem-net-smtp>=0:mail/rubygem-net-smtp \ rubygem-psych3>=3.1<4:textproc/rubygem-psych3 \ rubygem-net-pop>=0:mail/rubygem-net-pop \ @@ -56,16 +56,16 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-sprockets-gitlab>=3.7.5<3.8:devel/rubygem-sprockets-gitlab \ rubygem-sprockets-rails-rails-gitlab>=3.5.2<3.6:devel/rubygem-sprockets-rails-rails-gitlab \ rubygem-view_component-rails-gitlab>=3.23.2<3.24:devel/rubygem-view_component-rails-gitlab \ - rubygem-pg-gitlab>=1.6.1<1.7:databases/rubygem-pg-gitlab \ + rubygem-pg-gitlab>=1.6.3<1.7:databases/rubygem-pg-gitlab \ rubygem-rugged>=1.6<2:devel/rubygem-rugged \ rubygem-faraday-gitlab>=2.13.4<3:www/rubygem-faraday-gitlab \ rubygem-faraday-retry-gitlab>=2<3:www/rubygem-faraday-retry-gitlab \ rubygem-logger-gitlab>=1.7.0<1.8:devel/rubygem-logger-gitlab \ rubygem-marginalia>=1.11.1<1.12:databases/rubygem-marginalia \ rubygem-declarative_policy>=2.0.1<2.1:security/rubygem-declarative_policy \ - rubygem-coverband>=6.1.5<6.1.6:www/rubygem-coverband \ + rubygem-coverband>=6.1.7<6.2:www/rubygem-coverband \ rubygem-devise-rails-gitlab>=4.9.3<4.10:devel/rubygem-devise-rails-gitlab \ - rubygem-bcrypt>=3.1.20<3.2:security/rubygem-bcrypt \ + rubygem-bcrypt>=3.1.21<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-device_authorization_grant>=1.0.0<1.1:security/rubygem-doorkeeper-device_authorization_grant \ @@ -89,7 +89,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>=4.1.1<4.2:security/rubygem-devise-two-factor-rails-gitlab \ + rubygem-devise-two-factor-rails-gitlab>=5.1.0<5.2: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 \ @@ -104,11 +104,11 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-grape20>=2.0.0<2.1:devel/rubygem-grape20 \ rubygem-grape-entity>=1.0.1<1.1,1:devel/rubygem-grape-entity \ rubygem-grape-swagger-gitlab>=2.1.2<2.2:devel/rubygem-grape-swagger-gitlab \ - rubygem-grape-swagger-entity>=0.5.5<0.6:devel/rubygem-grape-swagger-entity \ + 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-apollo_upload_server>=2.1.6<2.2:net/rubygem-apollo_upload_server \ + rubygem-apollo_upload_server>=2.1.7<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 \ rubygem-kaminari-rails-gitlab>=1.2.2<1.3:www/rubygem-kaminari-rails-gitlab \ @@ -120,7 +120,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-prawn-svg>=0:print/rubygem-prawn-svg \ rubygem-fog-aws-gitlab>=3.28.0<4:net/rubygem-fog-aws-gitlab \ rubygem-fog-core-gitlab>=2.5<3:devel/rubygem-fog-core-gitlab \ - rubygem-fog-google-gitlab>=1.25.0<2:net/rubygem-fog-google-gitlab \ + rubygem-fog-google-gitlab>=1.29.3<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 \ @@ -135,7 +135,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-google-apis-iam_v1-gitlab>=0.79.0<0.80:devel/rubygem-google-apis-iam_v1-gitlab \ rubygem-google-apis-serviceusage_v1>=0.28.0<0.29:devel/rubygem-google-apis-serviceusage_v1 \ rubygem-google-apis-sqladmin_v1beta4-gitlab>=0.41.0<0.42:devel/rubygem-google-apis-sqladmin_v1beta4-gitlab \ - rubygem-google-apis-androidpublisher_v3-gitlab>=0.86.0<0.87:devel/rubygem-google-apis-androidpublisher_v3-gitlab \ + rubygem-google-apis-androidpublisher_v3-gitlab>=0.92.0<0.93:devel/rubygem-google-apis-androidpublisher_v3-gitlab \ rubygem-googleauth-gitlab>=1.14<2:security/rubygem-googleauth-gitlab \ rubygem-google-cloud-artifact_registry-v1>=0.11.0<0.12:textproc/rubygem-google-cloud-artifact_registry-v1 \ rubygem-google-cloud-compute-v1>=2.6.0<2.7:net/rubygem-google-cloud-compute-v1 \ @@ -163,8 +163,8 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-asciidoctor-kroki>=0.10.0<0.11:textproc/rubygem-asciidoctor-kroki \ rubygem-rouge-gitlab>=4.7.0<4.8:textproc/rubygem-rouge-gitlab \ rubygem-truncato>=0.7.13<0.8.0:textproc/rubygem-truncato \ - rubygem-nokogiri>=1.18.10<2:textproc/rubygem-nokogiri \ - rubygem-gitlab-glfm-markdown>=0.0.39<0.1:textproc/rubygem-gitlab-glfm-markdown \ + rubygem-nokogiri>=1.19.0<2:textproc/rubygem-nokogiri \ + 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 \ @@ -177,16 +177,16 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-sidekiq-gitlab>=7.3.9:devel/rubygem-sidekiq-gitlab \ rubygem-sidekiq-cron-rails-gitlab>=2.3.1<2.4:devel/rubygem-sidekiq-cron-rails-gitlab \ rubygem-fugit-gitlab>=1.11.2<1.12:devel/rubygem-fugit-gitlab \ - rubygem-httparty-gitlab>=0.23.0<0.24:www/rubygem-httparty-gitlab \ + rubygem-httparty-gitlab>=0.24.2<0.25:www/rubygem-httparty-gitlab \ rubygem-rainbow>=3.1.1<4.0:devel/rubygem-rainbow \ rubygem-ruby-progressbar>=1.11<2:devel/rubygem-ruby-progressbar \ - rubygem-re2>=2.20.0<3:devel/rubygem-re2 \ + rubygem-re2>=2.23.0<3:devel/rubygem-re2 \ rubygem-semver_dialects>=3.7.0<4:devel/rubygem-semver_dialects \ rubygem-version_sorter>=2.3<3:textproc/rubygem-version_sorter \ 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.1<1:databases/rubygem-redis-client \ + 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-clustering-gitlab>=5.4.1<5.5:databases/rubygem-redis-clustering-gitlab \ rubygem-connection_pool>=2.5.4<2.6:net/rubygem-connection_pool \ @@ -199,7 +199,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-circuitbox>=2.0.0<2.1:www/rubygem-circuitbox \ rubygem-sanitize60>=6.0.2<6.1:textproc/rubygem-sanitize60 \ rubygem-babosa>=2.0<3:textproc/rubygem-babosa \ - rubygem-loofah-gitlab>=2.24.1<2.25:textproc/rubygem-loofah-gitlab \ + rubygem-loofah-gitlab>=2.25.0<2.26:textproc/rubygem-loofah-gitlab \ rubygem-licensee-gitlab>=9.16<10: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 \ @@ -209,7 +209,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-rack-proxy>=0.7.7<0.8.0:www/rubygem-rack-proxy \ rubygem-cssbundling-rails-rails-gitlab>=1.4.3<1.5:www/rubygem-cssbundling-rails-rails-gitlab \ rubygem-terser>=1.0.2<1.0.3:textproc/rubygem-terser \ - rubygem-click_house-client>=0.8.6<0.9:databases/rubygem-click_house-client \ + rubygem-click_house-client>=0.8.7<0.9:databases/rubygem-click_house-client \ rubygem-addressable>=2.8<3:www/rubygem-addressable \ rubygem-gon-rails-gitlab>=6.5.0<6.6:www/rubygem-gon-rails-gitlab \ rubygem-request_store>=1.7.0<1.8:devel/rubygem-request_store \ @@ -219,9 +219,9 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-sentry-ruby>=5.23.0<5.24:devel/rubygem-sentry-ruby \ rubygem-sentry-rails>=5.23.0<5.24:devel/rubygem-sentry-rails \ rubygem-sentry-sidekiq>=5.23.0<5.24:devel/rubygem-sentry-sidekiq \ - rubygem-pg_query>=6.1.0<6.2:databases/rubygem-pg_query \ + 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.0.0<1.1:devel/rubygem-gitlab-labkit \ + rubygem-gitlab-labkit>=1.3.4<1.4: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 \ @@ -231,7 +231,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-peek-rails-gitlab>=1.1<2.0:devel/rubygem-peek-rails-gitlab \ 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.2.10<1.3:devel/rubygem-prometheus-client-mmap \ + 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-io-event>=1.12.1<2:devel/rubygem-io-event \ rubygem-gitlab-security_report_schemas>=0.1.3.min15.0.0.max15.2.3<0.1.3.min15.0.0.max15.2.4:devel/rubygem-gitlab-security_report_schemas \ @@ -267,11 +267,11 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ 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 \ - rubygem-gitlab-mail_room>=0.0.27<0.1.0:mail/rubygem-gitlab-mail_room \ + rubygem-gitlab-mail_room>=0.1.0<0.2.0:mail/rubygem-gitlab-mail_room \ rubygem-email_reply_trimmer>=0.1<1.0:mail/rubygem-email_reply_trimmer \ rubygem-html2text>=0.4.0:textproc/rubygem-html2text \ rubygem-stackprof>=0.2.27<0.3:devel/rubygem-stackprof \ - rubygem-rbtrace>=0.5.2<1.0:devel/rubygem-rbtrace \ + 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-health_check-rails-gitlab>=3.0<4:devel/rubygem-health_check-rails-gitlab \ @@ -280,14 +280,14 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ 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.7.0:net/rubygem-gitaly \ + rubygem-gitaly>=18.8.1:net/rubygem-gitaly \ rubygem-gitlab-kas-grpc>=${GITLAB_KAS_GRPC_VERSION}:net/rubygem-gitlab-kas-grpc \ rubygem-grpc-gitlab>=1.76.0<1.77:net/rubygem-grpc-gitlab \ rubygem-google-protobuf>=3.25.8<5:devel/rubygem-google-protobuf \ rubygem-toml-rb>=4.1<5:www/rubygem-toml-rb \ - rubygem-flipper-gitlab>=0.28.0<0.29:devel/rubygem-flipper-gitlab \ - rubygem-flipper-active_record-rails-gitlab>=0.28.0<0.29:databases/rubygem-flipper-active_record-rails-gitlab \ - rubygem-flipper-active_support_cache_store-rails-gitlab>=0.28.0<0.29:devel/rubygem-flipper-active_support_cache_store-rails-gitlab \ + 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 \ + rubygem-flipper-active_support_cache_store-rails-gitlab>=1.3.6<1.4:devel/rubygem-flipper-active_support_cache_store-rails-gitlab \ rubygem-unleash>=3.2.2<3.3:devel/rubygem-unleash \ rubygem-gitlab-experiment>=1.2.0<1.3:devel/rubygem-gitlab-experiment \ rubygem-lograge-rails-gitlab>=0.11.2<1.0:www/rubygem-lograge-rails-gitlab \ @@ -328,7 +328,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-i18n_data>=0.13.1<1:devel/rubygem-i18n_data \ rubygem-gitlab-cloud-connector>=1.44<2:security/rubygem-gitlab-cloud-connector \ rubygem-gvltools>=0.4.0<0.5:devel/rubygem-gvltools \ - rubygem-gitlab_query_language>=0.20.11<0.21:devel/rubygem-gitlab_query_language \ + rubygem-gitlab_query_language>=0.20.12<0.21:devel/rubygem-gitlab_query_language \ 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 \ @@ -548,7 +548,6 @@ post-install: @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/workhorse/changelogs/unreleased" >> ${TMPPLIST} .if ${FLAVOR:U} == ee # Gitlab-ee version - @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/ee/db/active_context/migrate" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/gems/gitlab-backup-cli/tmp" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/qa/qa/specs/features/ee/api/4_verify" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/qa/qa/specs/features/ee/api/5_package" >> ${TMPPLIST} diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index 227eb9d54fb9..f771a9042282 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,4 +1,4 @@ -GITLAB_VERSION= 18.8.4 +GITLAB_VERSION= 18.9.0 GITLAB_PORTREVISION= 4 # decrease this only if GITLAB_KAS_GRPC_VERSION is upgraded # Git version gitaly should use (from gitlab mirror) @@ -7,8 +7,8 @@ GITLAB_PORTREVISION= 4 # decrease this only if GITLAB_KAS_GRPC_VERSION is upgrad GITLAB_GIT_VERSION= 2.50.0 # return something like x.yy GITLAB_GIT_VERSION_SHORT= ${GITLAB_GIT_VERSION:C/^([0-9]*\.[0-9]*)\..*/\1/} -GITLAB_GIT_MASTER_VERSION= aea8cc3a10c325a22a75e2d4f582db959d3854ae -GITLAB_GIT_PREV_VERSION= 419c72cb8ada252b260efc38ff91fe201de7c8c3 +GITLAB_GIT_MASTER_VERSION= 83a69f19359e6d9bc980563caca38b2b5729808c +GITLAB_GIT_PREV_VERSION= aea8cc3a10c325a22a75e2d4f582db959d3854ae # Overwrite version for gitlab-kas-grpc #GITLAB_KAS_GRPC_VERSION= ${GITLAB_VERSION} diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo index 31b20ad1d1a5..bba6f5f1ba68 100644 --- a/www/gitlab/distinfo +++ b/www/gitlab/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1770744370 -SHA256 (gitlab-foss-v18.8.4.tar.bz2) = 6aa293135bd6a752fbff65b0be8642ce5f79109d1f538b84f9f32e385951312c -SIZE (gitlab-foss-v18.8.4.tar.bz2) = 130769049 -TIMESTAMP = 1770744374 -SHA256 (gitlab-v18.8.4-ee.tar.bz2) = 1930efc9c2e540f364dbc891513d1426b51b92905f385c7e5850f8a85496e2fd -SIZE (gitlab-v18.8.4-ee.tar.bz2) = 147942800 +TIMESTAMP = 1771570102 +SHA256 (gitlab-foss-v18.9.0.tar.bz2) = 130bb745692b34e424dd127e7630c8c6de6ae7de5a5bbb2515e2c7bfdefaa7c3 +SIZE (gitlab-foss-v18.9.0.tar.bz2) = 132341102 +TIMESTAMP = 1771570102 +SHA256 (gitlab-v18.9.0-ee.tar.bz2) = 832b1309e8c6ce3f4806fb87a4a156267c617e612231c8a1f6b5478000e7ffd5 +SIZE (gitlab-v18.9.0-ee.tar.bz2) = 149773561 diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index 8b77ad5af2cb..16cf8c9a3ed7 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,6 +1,6 @@ ---- Gemfile.orig 2026-02-09 19:24:50 UTC +--- Gemfile.orig 2026-02-18 17:09:38 UTC +++ Gemfile -@@ -163,7 +163,7 @@ gem 'graphql', '2.5.11', feature_category: :api +@@ -169,7 +169,7 @@ gem 'graphql', '2.5.11', feature_category: :api # GraphQL API gem 'graphql', '2.5.11', feature_category: :api @@ -9,7 +9,7 @@ gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api # Cells -@@ -292,7 +292,7 @@ gem 'state_machines-activerecord', '~> 0.100.0', featu +@@ -298,7 +298,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', -@@ -469,138 +469,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared # +@@ -475,138 +475,15 @@ 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 @@ -54,7 +54,7 @@ -group :development, :test do - gem 'deprecation_toolkit', '~> 2.2.3', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'bullet', '~> 8.0.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -- gem 'parser', '= 3.3.10.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +- gem 'parser', '= 3.3.10.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'pry-byebug', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'pry-rails', '~> 0.3.9', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'pry-shell', '~> 0.6.4', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 @@ -105,7 +105,7 @@ - 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.7.0', require: false, feature_category: :tooling +- gem 'undercover', '~> 0.8.0', require: false, feature_category: :tooling -end - # Gems required in omnibus-gitlab pipeline @@ -139,7 +139,7 @@ - - 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.25.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 - gem 'rails-controller-testing', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'concurrent-ruby', '~> 1.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'test-prof', '~> 1.5.0', feature_category: :tooling @@ -151,14 +151,14 @@ - # 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.3.0', require: false, feature_category: :tooling +- gem 'gitlab_quality-test_tooling', '~> 3.7.1', 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 -@@ -637,7 +514,7 @@ gem 'gitaly', '~> 18.7.0.pre.rc1', feature_category: : - gem 'gitaly', '~> 18.7.0.pre.rc1', feature_category: :gitaly +@@ -643,7 +520,7 @@ gem 'gitaly', '~> 18.8.0', feature_category: :gitaly + gem 'gitaly', '~> 18.8.0', feature_category: :gitaly # KAS GRPC protocol definitions -gem 'gitlab-kas-grpc', '~> 18.5.0-rc4', feature_category: :deployment_management @@ -166,7 +166,7 @@ gem 'grpc', '~> 1.76.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -@@ -660,7 +537,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: : +@@ -666,7 +543,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 @@ -175,7 +175,7 @@ gem 'retriable', '~> 3.1.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -@@ -741,11 +618,16 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc +@@ -747,11 +624,16 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc gem 'duo_api', '~> 1.3', feature_category: :system_access @@ -191,5 +191,5 @@ -gem "i18n_data", "~> 0.13.1", feature_category: :system_access +gem "i18n_data", "~> 0.13", feature_category: :system_access - gem "gitlab-cloud-connector", "~> 1.43", require: 'gitlab/cloud_connector', feature_category: :plan_provisioning + gem "gitlab-cloud-connector", "~> 1.44", require: 'gitlab/cloud_connector', feature_category: :plan_provisioning diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example index b4798fa8a670..f0b65a5d7342 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-01-14 08:40:57 UTC +--- config/gitlab.yml.example.orig 2026-02-18 17:09:38 UTC +++ config/gitlab.yml.example -@@ -516,7 +516,7 @@ production: &base +@@ -546,7 +546,7 @@ production: &base ## GitLab Pages pages: enabled: false @@ -9,14 +9,16 @@ # The location where pages are stored (default: shared/pages). # path: shared/pages -@@ -1288,13 +1288,13 @@ production: &base +@@ -1318,7 +1318,7 @@ production: &base repositories: storages: # You must have at least a `default` storage path. default: - gitaly_address: unix:/home/git/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port). + gitaly_address: unix:%%WWWDIR%%/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port). - # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage. - + # 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 +@@ -1327,7 +1327,7 @@ production: &base ## Backup settings backup: path: "tmp/backups" # Relative paths are relative to Rails.root (default: tmp/backups/) @@ -25,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 -@@ -1329,12 +1329,12 @@ production: &base +@@ -1362,12 +1362,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -41,7 +43,7 @@ # Git over HTTP upload_pack: true -@@ -1349,7 +1349,7 @@ production: &base +@@ -1382,7 +1382,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). @@ -50,7 +52,7 @@ database_traffic_capture: config: -@@ -1375,7 +1375,7 @@ production: &base +@@ -1408,7 +1408,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). @@ -59,7 +61,7 @@ # The URL to the external KAS API (used by the Kubernetes agents) # external_url: wss://kas.example.com -@@ -1397,13 +1397,13 @@ production: &base +@@ -1430,13 +1430,13 @@ production: &base ## GitLab Elasticsearch settings elasticsearch: @@ -75,7 +77,7 @@ ## Webpack settings # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running -@@ -1424,18 +1424,18 @@ production: &base +@@ -1457,18 +1457,18 @@ production: &base # Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq. sidekiq_exporter: @@ -101,7 +103,7 @@ # Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma. web_exporter: -@@ -1662,13 +1662,13 @@ test: +@@ -1695,13 +1695,13 @@ test: gitaly_address: unix:tmp/tests/gitaly/praefect.socket gitaly: diff --git a/www/gitlab/files/patch-package.json b/www/gitlab/files/patch-package.json index 19a4e012185d..a3e1b75ba6a0 100644 --- a/www/gitlab/files/patch-package.json +++ b/www/gitlab/files/patch-package.json @@ -1,6 +1,6 @@ ---- package.json.orig 2026-01-14 08:40:57 UTC +--- package.json.orig 2026-02-18 17:09:38 UTC +++ package.json -@@ -327,7 +327,8 @@ +@@ -320,7 +320,8 @@ "@types/node": "14.17.5", "chokidar": "^3.5.3", "nwsapi": "2.2.2", diff --git a/www/gitlab/pkg-message b/www/gitlab/pkg-message index d4973b5928a2..b9248099f2b2 100644 --- a/www/gitlab/pkg-message +++ b/www/gitlab/pkg-message @@ -6,7 +6,7 @@ Gitlab was installed successfully. You now need to set up the various components of Gitlab, so please follow the instructions in the guide at: -https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/install/18.8-freebsd.md +https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/install/18.9-freebsd.md EOM type: install } @@ -20,7 +20,7 @@ EOM If you just installed an major upgrade of GitLab, for example you switched from 18.6.x to 18.7.x, please follow the instructions in the guide at: -https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/18.7-18.8-freebsd.md +https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/18.8-18.9-freebsd.md If you just installed an minor upgrade of GitLab please follow the instructions in the guide at:home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69a18b9b.3f254.41cfff6f>