Date: Sun, 26 Oct 2025 15:54:25 GMT From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b4e64ecafdbd - main - www/gitlab: major upgrade to 18.4.3 Message-ID: <202510261554.59QFsPmF090466@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=b4e64ecafdbdcc429e38d5c2fc48cb52587a75d1 commit b4e64ecafdbdcc429e38d5c2fc48cb52587a75d1 Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2025-10-25 15:11:28 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2025-10-26 15:38:07 +0000 www/gitlab: major upgrade to 18.4.3 Changes: https://about.gitlab.com/releases/2025/09/18/gitlab-18-4-released/ --- devel/gitaly/Makefile | 5 ++- devel/gitaly/distinfo | 16 ++++---- devel/rubygem-fog-json-gitlab/Makefile | 3 +- devel/rubygem-grape-entity/Makefile | 4 +- devel/rubygem-jsonpath/Makefile | 3 +- net/gitlab-agent/distinfo | 10 ++--- net/rubygem-gitaly/Makefile | 2 +- net/rubygem-gitaly/distinfo | 6 +-- net/rubygem-gitlab-kas-grpc/distinfo | 6 +-- security/rubygem-googleauth-gitlab/Makefile | 4 +- security/rubygem-signet-gitlab/Makefile | 4 +- textproc/rubygem-elasticsearch-api-gitlab/Makefile | 3 +- .../Makefile | 3 +- textproc/rubygem-opensearch-ruby-gitlab/Makefile | 3 +- www/gitlab-pages/distinfo | 10 ++--- www/gitlab-workhorse/distinfo | 10 ++--- www/gitlab/Makefile | 48 ++++++++++++---------- www/gitlab/Makefile.common | 3 +- www/gitlab/distinfo | 12 +++--- www/gitlab/files/patch-Gemfile | 31 ++++++-------- www/gitlab/files/patch-config_gitlab.yml.example | 14 +++---- www/gitlab/pkg-message | 6 +-- 22 files changed, 106 insertions(+), 100 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index 50b44de5e20d..683d9ddc1cc4 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -25,7 +25,9 @@ CPE_VENDOR= gitlab USE_GITLAB= yes GL_ACCOUNT= gitlab-org -GL_TUPLE= gitlab-org:git:v${GITLAB_GIT_VERSION}:_build/_build/deps/git-v${GITLAB_GIT_VERSION_SHORT} +GL_TUPLE= gitlab-org:git:v${GITLAB_GIT_VERSION}:git_dep/_build/deps/git-v${GITLAB_GIT_VERSION_SHORT} \ + gitlab-org:git:${GITLAB_GIT_MASTER_VERSION}:git_master_dep/_build/deps/git-master + GO_MOD_DIST= gitlab GO_MODULE= gitlab.com/gitlab-org/gitaly/v18 @@ -40,7 +42,6 @@ post-patch: ${MV} ${WRKSRC}/config.toml.example ${WRKSRC}/config.toml.sample do-install: - ${MKDIR} ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${DATADIR}/bin ${FIND} ${WRKSRC} -name '*.orig' -delete (cd ${WRKSRC}/_build/bin/ && ${COPYTREE_BIN} . ${STAGEDIR}${DATADIR}/bin && \ diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index b099496bc405..f22c2c980aa1 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,7 +1,9 @@ -TIMESTAMP = 1761126609 -SHA256 (go/devel_gitaly/gitaly-v18.3.5/go.mod) = 163e0c24ae7263540250f58c84b9a0197cf6be768dab99b21dd463cc1a4659bc -SIZE (go/devel_gitaly/gitaly-v18.3.5/go.mod) = 13011 -SHA256 (go/devel_gitaly/gitaly-v18.3.5/gitaly-v18.3.5.tar.bz2) = b65e63c288e3682223262333d5056a114aea08410925aca249bd5d7418b986eb -SIZE (go/devel_gitaly/gitaly-v18.3.5/gitaly-v18.3.5.tar.bz2) = 4557618 -SHA256 (go/devel_gitaly/gitaly-v18.3.5/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4 -SIZE (go/devel_gitaly/gitaly-v18.3.5/git-v2.50.0.tar.bz2) = 9249878 +TIMESTAMP = 1761469489 +SHA256 (go/devel_gitaly/gitaly-v18.4.3/go.mod) = 008121a90304036555baa63f27b0ac1ebed4e56000dddcb3a896985c36eeb9e8 +SIZE (go/devel_gitaly/gitaly-v18.4.3/go.mod) = 13012 +SHA256 (go/devel_gitaly/gitaly-v18.4.3/gitaly-v18.4.3.tar.bz2) = 6dfd5dd98c444a7cbf0712ce70e5e5653c8ae8942ef0f50e9d8c2a57689126e4 +SIZE (go/devel_gitaly/gitaly-v18.4.3/gitaly-v18.4.3.tar.bz2) = 4579939 +SHA256 (go/devel_gitaly/gitaly-v18.4.3/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4 +SIZE (go/devel_gitaly/gitaly-v18.4.3/git-v2.50.0.tar.bz2) = 9249878 +SHA256 (go/devel_gitaly/gitaly-v18.4.3/gitlab-org-git-23466173824c0a0f835c0d790c2f38156ae6284a_GL0.tar.gz) = 01a4069b15e9262151b3b97f989d4939ba8966bd5269875add2a34806817c01a +SIZE (go/devel_gitaly/gitaly-v18.4.3/gitlab-org-git-23466173824c0a0f835c0d790c2f38156ae6284a_GL0.tar.gz) = 11745131 diff --git a/devel/rubygem-fog-json-gitlab/Makefile b/devel/rubygem-fog-json-gitlab/Makefile index 803626e022ee..144738e1f69d 100644 --- a/devel/rubygem-fog-json-gitlab/Makefile +++ b/devel/rubygem-fog-json-gitlab/Makefile @@ -1,5 +1,6 @@ PORTNAME= fog-json PORTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= -gitlab @@ -12,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md RUN_DEPENDS= rubygem-fog-core-gitlab>=0:devel/rubygem-fog-core-gitlab \ - rubygem-multi_json>=1.10<2:devel/rubygem-multi_json + rubygem-multi_json-gitlab>=1.10<2:devel/rubygem-multi_json-gitlab USES= gem diff --git a/devel/rubygem-grape-entity/Makefile b/devel/rubygem-grape-entity/Makefile index 2ff52e9cfdc0..737584303ab1 100644 --- a/devel/rubygem-grape-entity/Makefile +++ b/devel/rubygem-grape-entity/Makefile @@ -1,6 +1,6 @@ PORTNAME= grape-entity PORTVERSION= 1.0.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -13,7 +13,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-activesupport-gitlab>=3.0.0:devel/rubygem-activesupport-gitlab \ - rubygem-multi_json>=1.3.2:devel/rubygem-multi_json + rubygem-multi_json-gitlab>=1.3.2:devel/rubygem-multi_json-gitlab USES= gem diff --git a/devel/rubygem-jsonpath/Makefile b/devel/rubygem-jsonpath/Makefile index d5de9e17c5dc..ee44df172c2b 100644 --- a/devel/rubygem-jsonpath/Makefile +++ b/devel/rubygem-jsonpath/Makefile @@ -1,5 +1,6 @@ PORTNAME= jsonpath PORTVERSION= 1.1.5 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -10,7 +11,7 @@ WWW= https://github.com/joshbuddy/jsonpath LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md -RUN_DEPENDS= rubygem-multi_json>=0:devel/rubygem-multi_json +RUN_DEPENDS= rubygem-multi_json-gitlab>=0:devel/rubygem-multi_json-gitlab USES= gem diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo index 5bb530eb8a42..6d21da0c5ac5 100644 --- a/net/gitlab-agent/distinfo +++ b/net/gitlab-agent/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1761126616 -SHA256 (go/net_gitlab-agent/gitlab-agent-v18.3.5/v18.3.5.mod) = 2ec01cce9df32ed086dd50ebf5d7d120d6edffe83b9ea78dbfba19d1e92d77d2 -SIZE (go/net_gitlab-agent/gitlab-agent-v18.3.5/v18.3.5.mod) = 10172 -SHA256 (go/net_gitlab-agent/gitlab-agent-v18.3.5/v18.3.5.zip) = 0cb526c472e87831c2a2c97c34004a420fa4a58726999ec4ab6537f27524c575 -SIZE (go/net_gitlab-agent/gitlab-agent-v18.3.5/v18.3.5.zip) = 1790545 +TIMESTAMP = 1761293557 +SHA256 (go/net_gitlab-agent/gitlab-agent-v18.4.3/v18.4.3.mod) = 9ae3edb42b84eed1873ec7cf85823d22941ef437197751e817efbc8e1035d7c2 +SIZE (go/net_gitlab-agent/gitlab-agent-v18.4.3/v18.4.3.mod) = 9857 +SHA256 (go/net_gitlab-agent/gitlab-agent-v18.4.3/v18.4.3.zip) = 3a2381270b27a5cef80e9b4a79de46119bcdb8a94a56e15eb475c78d0bd1c6df +SIZE (go/net_gitlab-agent/gitlab-agent-v18.4.3/v18.4.3.zip) = 1944321 diff --git a/net/rubygem-gitaly/Makefile b/net/rubygem-gitaly/Makefile index 59689d7a5c42..9c54667a78fc 100644 --- a/net/rubygem-gitaly/Makefile +++ b/net/rubygem-gitaly/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitaly -PORTVERSION= 18.2.4 +PORTVERSION= 18.4.3 CATEGORIES= net rubygems MASTER_SITES= RG diff --git a/net/rubygem-gitaly/distinfo b/net/rubygem-gitaly/distinfo index b6ab46268620..c23ecace7aca 100644 --- a/net/rubygem-gitaly/distinfo +++ b/net/rubygem-gitaly/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1755676933 -SHA256 (rubygem/gitaly-18.2.4.gem) = 1102eaf07db0aa34e602732816ca1bacc692b1141bd7bf5b03a90afed4c29501 -SIZE (rubygem/gitaly-18.2.4.gem) = 53248 +TIMESTAMP = 1761394826 +SHA256 (rubygem/gitaly-18.4.3.gem) = 55b44ecb5f78374bede6803f5965ca5ca93bbc7c8fca6ab3a4e9e48906a07c4c +SIZE (rubygem/gitaly-18.4.3.gem) = 53248 diff --git a/net/rubygem-gitlab-kas-grpc/distinfo b/net/rubygem-gitlab-kas-grpc/distinfo index 1f1c80a1bf50..92fff2946ed1 100644 --- a/net/rubygem-gitlab-kas-grpc/distinfo +++ b/net/rubygem-gitlab-kas-grpc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1761126631 -SHA256 (rubygem/gitlab-kas-grpc-18.3.5.gem) = 0bff5fc48f431f463c017133492908dece35ba9a911a283147fc83741ec2be89 -SIZE (rubygem/gitlab-kas-grpc-18.3.5.gem) = 10752 +TIMESTAMP = 1761293572 +SHA256 (rubygem/gitlab-kas-grpc-18.4.3.gem) = c40381ee46c49aad6b9c52dd31179b1d03e65976d7b43e00fb6f2d13ff2a4d4e +SIZE (rubygem/gitlab-kas-grpc-18.4.3.gem) = 11264 diff --git a/security/rubygem-googleauth-gitlab/Makefile b/security/rubygem-googleauth-gitlab/Makefile index a574ba1de414..802b1986381e 100644 --- a/security/rubygem-googleauth-gitlab/Makefile +++ b/security/rubygem-googleauth-gitlab/Makefile @@ -1,6 +1,6 @@ PORTNAME= googleauth PORTVERSION= 1.14.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security rubygems MASTER_SITES= RG PKGNAMESUFFIX= -gitlab @@ -16,7 +16,7 @@ RUN_DEPENDS= rubygem-faraday-gitlab>=1.0<3.0:www/rubygem-faraday-gitlab \ rubygem-google-cloud-env-gitlab>=2.2<3:net/rubygem-google-cloud-env-gitlab \ rubygem-google-logging-utils>=0.1<1:devel/rubygem-google-logging-utils \ rubygem-jwt2>=1.4<3.0:www/rubygem-jwt2 \ - rubygem-multi_json>=1.11<2:devel/rubygem-multi_json \ + rubygem-multi_json-gitlab>=1.11<2:devel/rubygem-multi_json-gitlab \ rubygem-os>=0.9<2.0:devel/rubygem-os \ rubygem-signet-gitlab>=0.16<2:security/rubygem-signet-gitlab diff --git a/security/rubygem-signet-gitlab/Makefile b/security/rubygem-signet-gitlab/Makefile index d0f7b9ffea03..4a327c3f217a 100644 --- a/security/rubygem-signet-gitlab/Makefile +++ b/security/rubygem-signet-gitlab/Makefile @@ -1,6 +1,6 @@ PORTNAME= signet PORTVERSION= 0.19.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security rubygems MASTER_SITES= RG PKGNAMESUFFIX= -gitlab @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-addressable>=2.8<3:www/rubygem-addressable \ rubygem-faraday-gitlab>=0.17.5<3.0:www/rubygem-faraday-gitlab \ rubygem-jwt2>=1.5<3.0:www/rubygem-jwt2 \ - rubygem-multi_json>=1.10<2:devel/rubygem-multi_json + rubygem-multi_json-gitlab>=1.10<2:devel/rubygem-multi_json-gitlab USES= gem diff --git a/textproc/rubygem-elasticsearch-api-gitlab/Makefile b/textproc/rubygem-elasticsearch-api-gitlab/Makefile index aa647ba86c7a..4a3048935d1a 100644 --- a/textproc/rubygem-elasticsearch-api-gitlab/Makefile +++ b/textproc/rubygem-elasticsearch-api-gitlab/Makefile @@ -1,5 +1,6 @@ PORTNAME= elasticsearch-api PORTVERSION= 7.17.11 +PORTREVISION= 1 CATEGORIES= textproc rubygems MASTER_SITES= RG PKGNAMESUFFIX= -gitlab @@ -11,7 +12,7 @@ WWW= https://github.com/elastic/elasticsearch-ruby/tree/master/elasticsearch-ap LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-multi_json>=0:devel/rubygem-multi_json +RUN_DEPENDS= rubygem-multi_json-gitlab>=0:devel/rubygem-multi_json-gitlab USES= gem diff --git a/textproc/rubygem-elasticsearch-transport-gitlab/Makefile b/textproc/rubygem-elasticsearch-transport-gitlab/Makefile index 22648b2002e0..5e61bac10ff4 100644 --- a/textproc/rubygem-elasticsearch-transport-gitlab/Makefile +++ b/textproc/rubygem-elasticsearch-transport-gitlab/Makefile @@ -1,5 +1,6 @@ PORTNAME= elasticsearch-transport PORTVERSION= 7.17.11 +PORTREVISION= 1 CATEGORIES= textproc rubygems MASTER_SITES= RG PKGNAMESUFFIX= -gitlab @@ -12,7 +13,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-faraday-gitlab>=1<3:www/rubygem-faraday-gitlab \ - rubygem-multi_json>=0:devel/rubygem-multi_json + rubygem-multi_json-gitlab>=0:devel/rubygem-multi_json-gitlab USES= gem diff --git a/textproc/rubygem-opensearch-ruby-gitlab/Makefile b/textproc/rubygem-opensearch-ruby-gitlab/Makefile index 3b89098af84d..ba4d305c444a 100644 --- a/textproc/rubygem-opensearch-ruby-gitlab/Makefile +++ b/textproc/rubygem-opensearch-ruby-gitlab/Makefile @@ -1,5 +1,6 @@ PORTNAME= opensearch-ruby PORTVERSION= 3.4.0 +PORTREVISION= 1 CATEGORIES= textproc rubygems MASTER_SITES= RG PKGNAMESUFFIX= -gitlab @@ -12,7 +13,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= rubygem-faraday-gitlab>=1.0<3:www/rubygem-faraday-gitlab \ - rubygem-multi_json>=1.0:devel/rubygem-multi_json + rubygem-multi_json-gitlab>=1.0:devel/rubygem-multi_json-gitlab USES= gem diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo index 73f31046db7a..444bdef2a0d2 100644 --- a/www/gitlab-pages/distinfo +++ b/www/gitlab-pages/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1761126618 -SHA256 (go/www_gitlab-pages/gitlab-pages-v18.3.5/go.mod) = f009bb2f145a5e8bfa40069b413d54c6212f0062253d9de94dc93e61b93b2a96 -SIZE (go/www_gitlab-pages/gitlab-pages-v18.3.5/go.mod) = 3436 -SHA256 (go/www_gitlab-pages/gitlab-pages-v18.3.5/gitlab-pages-v18.3.5.tar.bz2) = 38b55ec6e2a9c0b63522e83ff7480654531d5bc206fb0a4f7fb5916c74081b38 -SIZE (go/www_gitlab-pages/gitlab-pages-v18.3.5/gitlab-pages-v18.3.5.tar.bz2) = 236409 +TIMESTAMP = 1761293558 +SHA256 (go/www_gitlab-pages/gitlab-pages-v18.4.3/go.mod) = 69bfd26ca7532f5c882722ae356c2931b34c2c27098c59b4da272a94dd6e95df +SIZE (go/www_gitlab-pages/gitlab-pages-v18.4.3/go.mod) = 3416 +SHA256 (go/www_gitlab-pages/gitlab-pages-v18.4.3/gitlab-pages-v18.4.3.tar.bz2) = 8cd115099e4a427ae4525100ac8c5d0878692cad330dba4a3d15d0ca34df03f6 +SIZE (go/www_gitlab-pages/gitlab-pages-v18.4.3/gitlab-pages-v18.4.3.tar.bz2) = 237294 diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index 9ef1833c0df6..7740761377a4 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1761126630 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.3.5/go.mod) = a06961ad67888e3ff8e8fe5485b13d3ba413f783085338f35617899c0ff9df46 -SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.3.5/go.mod) = 9331 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.3.5/gitlab-foss-v18.3.5.tar.bz2) = a3fdaee042b98938b6b0d663d297f50b3f7468741b1def98895f991be5cb7fb2 -SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.3.5/gitlab-foss-v18.3.5.tar.bz2) = 122289928 +TIMESTAMP = 1761293571 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.4.3/go.mod) = 0aad1cb79dda4891ba48069242edac3c8e24752646ade6efe249a3db76b9bd77 +SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.4.3/go.mod) = 9343 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.4.3/gitlab-foss-v18.4.3.tar.bz2) = dd2c1c3261e8ad0547bb612733a5dfa01b186dab409e9b90a15da67617759e5b +SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.4.3/gitlab-foss-v18.4.3.tar.bz2) = 122558508 diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 5b9d1e9552dd..911afd467867 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -29,12 +29,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # mail/rubygem-net-pop is required as ruby 3.1 removed it #gitlab-zoekt-indexer>=0.16.0:textproc/gitlab-zoekt-indexer MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ - gitlab-elasticsearch-indexer>=5.7.0:textproc/gitlab-elasticsearch-indexer \ + gitlab-elasticsearch-indexer>=5.9.1:textproc/gitlab-elasticsearch-indexer \ gitlab-agent>=${GITLAB_VERSION}:net/gitlab-agent \ gitlab-pages>=${GITLAB_VERSION}:www/gitlab-pages \ gitlab-shell>=14.45.2:devel/gitlab-shell \ gitlab-workhorse>=${GITLAB_VERSION}:www/gitlab-workhorse \ - gitlab-zoekt-indexer>=1.2.0:textproc/gitlab-zoekt-indexer \ + gitlab-zoekt-indexer>=1.4.4:textproc/gitlab-zoekt-indexer \ redis>=6.2.11:databases/redis \ yarn${NODEJS_SUFFIX}>=1.10.0:www/yarn${NODEJS_SUFFIX} \ gtar>0:archivers/gtar \ @@ -60,14 +60,14 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ 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>=1.1.0<1.2:security/rubygem-declarative_policy \ + rubygem-declarative_policy>=2.0.1<2.1:security/rubygem-declarative_policy \ rubygem-coverband>=6.1.5<6.1.6: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-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 \ - rubygem-rexml>=3.4.1<3.5:textproc/rubygem-rexml \ + rubygem-rexml>=3.4.2<3.5:textproc/rubygem-rexml \ rubygem-ruby-saml-gitlab>=1.18.1<2:security/rubygem-ruby-saml-gitlab \ rubygem-omniauth-saml-gitlab>=2.2.4<3:security/rubygem-omniauth-saml-gitlab \ rubygem-omniauth-gl>=2.1.3<3:security/rubygem-omniauth-gl \ @@ -96,7 +96,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-browser5>=5.3.1<5.4:www/rubygem-browser5 \ rubygem-ohai>=18.1.18<19:sysutils/rubygem-ohai \ rubygem-gpgme>=2.0.25<2.1.0:security/rubygem-gpgme \ - rubygem-gitlab_omniauth-ldap-gitlab>=2.2.0<2.3.0:net/rubygem-gitlab_omniauth-ldap-gitlab \ + rubygem-gitlab_omniauth-ldap-gitlab>=2.3.0<2.4.0:net/rubygem-gitlab_omniauth-ldap-gitlab \ rubygem-net-ldap017>=0.17.1<0.18:net/rubygem-net-ldap017 \ rubygem-grape20>=2.0.0<2.1:devel/rubygem-grape20 \ rubygem-grape-entity>=1.0.1<1.1,1:devel/rubygem-grape-entity \ @@ -112,26 +112,27 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-hamlit>=3.0.3<3.1:www/rubygem-hamlit \ rubygem-carrierwave-gitlab>=1.3.4<2.0:www/rubygem-carrierwave-gitlab \ rubygem-mini_magick4>=4.12<5:graphics/rubygem-mini_magick4 \ + rubygem-marcel-gitlab>=1.0.4<1.1:devel/rubygem-marcel-gitlab \ rubygem-prawn>=0:print/rubygem-prawn \ 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.1.0<2.1.1:devel/rubygem-fog-core-gitlab \ - rubygem-fog-google-gitlab>=1.24.1<1.25:net/rubygem-fog-google-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-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-google-apis-storage_v1-gitlab>=0.29<1:devel/rubygem-google-apis-storage_v1-gitlab \ - rubygem-google-cloud-storage-gitlab>=1.45.0<1.46:net/rubygem-google-cloud-storage-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 \ - rubygem-google-apis-compute_v1-gitlab>=0.127.0<0.128:devel/rubygem-google-apis-compute_v1-gitlab \ + rubygem-google-apis-compute_v1-gitlab>=0.129.0<0.130:devel/rubygem-google-apis-compute_v1-gitlab \ rubygem-google-apis-container_v1>=0.100.0<0.101:devel/rubygem-google-apis-container_v1 \ - rubygem-google-apis-container_v1beta1>=0.43.0<0.44:devel/rubygem-google-apis-container_v1beta1 \ + rubygem-google-apis-container_v1beta1>=0.90.0<0.91:devel/rubygem-google-apis-container_v1beta1 \ rubygem-google-apis-cloudbilling_v1>=0.22.0<0.23:devel/rubygem-google-apis-cloudbilling_v1 \ rubygem-google-apis-cloudresourcemanager_v1-gitlab>=0.31.0<0.32:devel/rubygem-google-apis-cloudresourcemanager_v1-gitlab \ rubygem-google-apis-iam_v1-gitlab>=0.73.0<0.74: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.84.0<0.85:devel/rubygem-google-apis-androidpublisher_v3-gitlab \ + rubygem-google-apis-androidpublisher_v3-gitlab>=0.86.0<0.87: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 \ @@ -140,7 +141,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-elasticsearch-rails7>=7.2<8:textproc/rubygem-elasticsearch-rails7 \ rubygem-elasticsearch-api-gitlab>=7.17.11<7.18:textproc/rubygem-elasticsearch-api-gitlab \ rubygem-aws-sdk-core-gitlab>=3.226.3<3.227:devel/rubygem-aws-sdk-core-gitlab \ - rubygem-aws-sdk-cloudformation-gitlab>=1.133<2:devel/rubygem-aws-sdk-cloudformation-gitlab \ + rubygem-aws-sdk-cloudformation-gitlab>=1.134<2:devel/rubygem-aws-sdk-cloudformation-gitlab \ rubygem-aws-sdk-s3-gitlab>=1.193.0<1.194:devel/rubygem-aws-sdk-s3-gitlab \ rubygem-faraday-typhoeus-gitlab>=1.1<2:www/rubygem-faraday-typhoeus-gitlab \ rubygem-faraday_middleware-aws-sigv4-gitlab>=1.0.1<1.1:devel/rubygem-faraday_middleware-aws-sigv4-gitlab \ @@ -173,7 +174,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-state_machines-activerecord-gitlab>=0.8.0<0.9.0:databases/rubygem-state_machines-activerecord-gitlab \ rubygem-sidekiq-gitlab>=7.3.9:devel/rubygem-sidekiq-gitlab \ rubygem-sidekiq-cron-rails-gitlab>=1.12.0<1.13:devel/rubygem-sidekiq-cron-rails-gitlab \ - rubygem-fugit111>=1.11.1<1.12:devel/rubygem-fugit111 \ + rubygem-fugit111>=1.11.2<1.12:devel/rubygem-fugit111 \ rubygem-httparty-gitlab>=0.23.0<0.24:www/rubygem-httparty-gitlab \ rubygem-rainbow>=3.1.1<4.0:devel/rubygem-rainbow \ rubygem-ruby-progressbar>=1.11<2:devel/rubygem-ruby-progressbar \ @@ -186,7 +187,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-redis-client>=0.25.1<1:databases/rubygem-redis-client \ rubygem-redis-cluster-client>=0.13.5<1:databases/rubygem-redis-cluster-client \ rubygem-redis-clustering-gitlab>=5.4.0<5.4.1:databases/rubygem-redis-clustering-gitlab \ - rubygem-connection_pool>=2.5.3<2.6:net/rubygem-connection_pool \ + rubygem-connection_pool>=2.5.4<2.6:net/rubygem-connection_pool \ rubygem-redis-actionpack-rails-gitlab>=5.5.0<5.6:databases/rubygem-redis-actionpack-rails-gitlab \ rubygem-jira-ruby-gitlab>=2.3.0<2.4:devel/rubygem-jira-ruby-gitlab \ rubygem-atlassian-jwt>=0.2.1<0.3.0:www/rubygem-atlassian-jwt \ @@ -206,9 +207,9 @@ 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.3.5<0.3.6:databases/rubygem-click_house-client \ + rubygem-click_house-client>=0.5.1<0.6:databases/rubygem-click_house-client \ rubygem-addressable>=2.8<3:www/rubygem-addressable \ - rubygem-gon-rails-gitlab>=6.4.0<6.5:www/rubygem-gon-rails-gitlab \ + 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 \ rubygem-base32>=0.3.4<0.4.0:converters/rubygem-base32 \ rubygem-gitlab-license>=2.6<3:devel/rubygem-gitlab-license \ @@ -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.1.0<6.2:databases/rubygem-pg_query \ rubygem-premailer-rails-rails-gitlab>=1.12.0<1.13:mail/rubygem-premailer-rails-rails-gitlab \ - rubygem-gitlab-labkit>=0.39.0<0.40:devel/rubygem-gitlab-labkit \ + rubygem-gitlab-labkit>=0.40.0<0.41: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,9 +230,11 @@ 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.2.10<1.3:devel/rubygem-prometheus-client-mmap \ - rubygem-async-gitlab>=2.24.0<2.25:devel/rubygem-async-gitlab \ + rubygem-async-gitlab>=2.28.0<2.29: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 \ + rubygem-vite_rails-gitlab>=3.0.17<3.1:devel/rubygem-vite_rails-gitlab \ + rubygem-vite_ruby-gitlab>=3.9.0<3.10:devel/rubygem-vite_ruby-gitlab \ rubygem-opentelemetry-sdk>=1.5.0:devel/rubygem-opentelemetry-sdk \ rubygem-opentelemetry-exporter-otlp>=0.29.1:devel/rubygem-opentelemetry-exporter-otlp \ rubygem-opentelemetry-instrumentation-active_support>=0.6.0:devel/rubygem-opentelemetry-instrumentation-active_support \ @@ -275,7 +278,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-net-ntp>0:net/rubygem-net-ntp \ rubygem-ssh_data>=1.3<2:security/rubygem-ssh_data \ rubygem-spamcheck>=1.3.3<1.4:net/rubygem-spamcheck \ - rubygem-gitaly>=18.2.1:net/rubygem-gitaly \ + rubygem-gitaly>=18.4.0:net/rubygem-gitaly \ rubygem-gitlab-kas-grpc>=${GITLAB_KAS_GRPC_VERSION}:net/rubygem-gitlab-kas-grpc \ rubygem-grpc-gitlab>=1.74.0<2:net/rubygem-grpc-gitlab \ rubygem-google-protobuf3>=3.25.8<4:devel/rubygem-google-protobuf3 \ @@ -299,7 +302,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-json_schemer>=2.3.0<2.4:devel/rubygem-json_schemer \ rubygem-oj>=3.16.11<3.17:devel/rubygem-oj \ rubygem-oj-introspect>=0.8<1:devel/rubygem-oj-introspect \ - rubygem-multi_json114>=1.14.1<1.15:devel/rubygem-multi_json114 \ + rubygem-multi_json-gitlab>=1.17.0<1.18:devel/rubygem-multi_json-gitlab \ rubygem-yajl-ruby>=1.4.3<1.5:devel/rubygem-yajl-ruby \ rubygem-webauthn>=3.0<4:security/rubygem-webauthn \ rubygem-ipaddress>=0.8.3<0.9:net/rubygem-ipaddress \ @@ -307,11 +310,12 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-ed25519>=1.4.0<1.5:security/rubygem-ed25519 \ rubygem-cvss-suite>=3.3.0<3.4:security/rubygem-cvss-suite \ rubygem-arr-pm>=0.0.12<0.1:devel/rubygem-arr-pm \ - rubygem-devfile>=0.4.4<0.5:net/rubygem-devfile \ + rubygem-devfile>=0.4.8<0.5:net/rubygem-devfile \ rubygem-hashdiff>=1.2.0<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 \ - rubygem-telesignenterprise>=2.2<3:devel/rubygem-telesignenterprise \ + rubygem-telesignenterprise>=2.6<3:devel/rubygem-telesignenterprise \ + rubygem-base6402>=0.2.0<0.3:converters/rubygem-base6402 \ rubygem-net-protocol>=0.2.2<0.3:net/rubygem-net-protocol \ rubygem-nkf>=0.2.0<0.3:net/rubygem-nkf \ rubygem-net-http>=0.6.0<0.6.1:www/rubygem-net-http \ diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index f8a74c64788b..e0848ef8faaa 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,10 +1,11 @@ -GITLAB_VERSION= 18.3.5 +GITLAB_VERSION= 18.4.3 GITLAB_PORTREVISION= 0 # Git version gitaly should use (from gitlab mirror) # Find current tag from Makefile and .gitlab-ci.yaml # and from https://gitlab.com/gitlab-org/git/-/tags GITLAB_GIT_VERSION= 2.50.0 +GITLAB_GIT_MASTER_VERSION= 23466173824c0a0f835c0d790c2f38156ae6284a # return something like x.yy GITLAB_GIT_VERSION_SHORT= ${GITLAB_GIT_VERSION:C/^([0-9]*\.[0-9]*)\..*/\1/} diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo index 1ac0e8dc35ce..89ed69ca076a 100644 --- a/www/gitlab/distinfo +++ b/www/gitlab/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1761126561 -SHA256 (gitlab-foss-v18.3.5.tar.bz2) = a3fdaee042b98938b6b0d663d297f50b3f7468741b1def98895f991be5cb7fb2 -SIZE (gitlab-foss-v18.3.5.tar.bz2) = 122289928 -TIMESTAMP = 1761126604 -SHA256 (gitlab-v18.3.5-ee.tar.bz2) = 27d8c7de165fe25714305a070707626635f5d9f397837a86279b1ac875576732 -SIZE (gitlab-v18.3.5-ee.tar.bz2) = 138198849 +TIMESTAMP = 1761396302 +SHA256 (gitlab-foss-v18.4.3.tar.bz2) = dd2c1c3261e8ad0547bb612733a5dfa01b186dab409e9b90a15da67617759e5b +SIZE (gitlab-foss-v18.4.3.tar.bz2) = 122558508 +TIMESTAMP = 1761396303 +SHA256 (gitlab-v18.4.3-ee.tar.bz2) = adc59024b9bd00128bf75b9a6fc3f4178ca41f64fa2043e2a53e4eda5602b72d +SIZE (gitlab-v18.4.3-ee.tar.bz2) = 138452921 diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index 7943be7c3489..c5e64b759360 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2025-08-20 06:43:08 UTC +--- Gemfile.orig 2025-10-21 19:24:47 UTC +++ Gemfile @@ -165,7 +165,7 @@ gem 'graphql', '2.5.11', feature_category: :api @@ -18,13 +18,14 @@ gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', -@@ -468,148 +468,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared +@@ -473,141 +473,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared gem 'warning', '~> 1.5.0', feature_category: :shared -group :development do - gem 'lefthook', '~> 1.12.0', require: false, feature_category: :tooling -- gem 'rubocop', feature_category: :tooling +- gem 'rubocop', feature_category: :tooling, require: false +- gem 'debug', '~> 1.11.0', feature_category: :shared - - gem 'solargraph', '~> 0.54.0', require: false, feature_category: :shared - gem 'solargraph-rspec', '~> 0.5.1', require: false, feature_category: :shared @@ -80,9 +81,6 @@ - gem 'benchmark-ips', '~> 2.14.0', require: false, feature_category: :shared - gem 'benchmark-memory', '~> 0.1', require: false, feature_category: :shared - -- # Profiling data from CI/CD pipelines -- gem 'influxdb-client', '~> 3.1', require: false, feature_category: :tooling -- - gem 'knapsack', '~> 4.0.0', feature_category: :tooling - gem 'gitlab-crystalball', '~> 1.1.0', require: false, feature_category: :tooling - gem 'test_file_finder', '~> 0.3.1', feature_category: :tooling @@ -97,11 +95,6 @@ - - gem 'pact', '~> 1.64', feature_category: :shared - -- # For now we only use vite in development / test, and not for production builds -- # See: https://gitlab.com/gitlab-org/frontend/rfcs/-/issues/106 -- gem 'vite_rails', '~> 3.0.17', feature_category: :shared -- gem 'vite_ruby', '~> 3.9.0', feature_category: :shared -- - gem 'gitlab-housekeeper', path: 'gems/gitlab-housekeeper', feature_category: :tooling - - gem 'yard', '~> 0.9', require: false, feature_category: :tooling @@ -161,26 +154,26 @@ - # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 - gem 'derailed_benchmarks', require: false, feature_category: :shared - -- gem 'gitlab_quality-test_tooling', '~> 2.18.0', require: false, feature_category: :tooling +- gem 'gitlab_quality-test_tooling', '~> 2.20.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 -@@ -643,10 +510,10 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside +@@ -641,10 +515,10 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat # Gitaly GRPC protocol definitions --gem 'gitaly', '~> 18.2.0', feature_category: :gitaly -+gem 'gitaly', '~> 18.2', feature_category: :gitaly +-gem 'gitaly', '~> 18.4.0.pre.rc1', feature_category: :gitaly ++gem 'gitaly', '~> 18.4', feature_category: :gitaly # KAS GRPC protocol definitions --gem 'gitlab-kas-grpc', '~> 18.2.0', feature_category: :deployment_management -+gem 'gitlab-kas-grpc', '~> 18.2', feature_category: :deployment_management +-gem 'gitlab-kas-grpc', '~> 18.3.0', feature_category: :deployment_management ++gem 'gitlab-kas-grpc', '~> 18.3', feature_category: :deployment_management gem 'grpc', '~> 1.74.0', feature_category: :shared -@@ -669,7 +536,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: : +@@ -667,7 +541,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: : gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :shared # Countries list @@ -189,7 +182,7 @@ gem 'retriable', '~> 3.1.2', feature_category: :shared -@@ -750,10 +617,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc +@@ -752,10 +626,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc gem 'duo_api', '~> 1.3', feature_category: :system_access diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example index 5c05397684c9..d4e98d985eb3 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 2025-08-20 06:43:08 UTC +--- config/gitlab.yml.example.orig 2025-10-21 19:24:47 UTC +++ config/gitlab.yml.example -@@ -511,7 +511,7 @@ production: &base +@@ -507,7 +507,7 @@ production: &base ## GitLab Pages pages: enabled: false @@ -9,7 +9,7 @@ # The location where pages are stored (default: shared/pages). # path: shared/pages -@@ -1261,13 +1261,13 @@ production: &base +@@ -1252,13 +1252,13 @@ production: &base repositories: storages: # You must have at least a `default` storage path. default: @@ -25,7 +25,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 -@@ -1302,12 +1302,12 @@ production: &base +@@ -1293,12 +1293,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -41,15 +41,15 @@ # Git over HTTP upload_pack: true -@@ -1322,7 +1322,7 @@ production: &base +@@ -1313,7 +1313,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). - # secret_file: /home/git/gitlab/.gitlab_workhorse_secret + # secret_file: %%WWWDIR%%/.gitlab_workhorse_secret - cell: - # enabled: false + database_traffic_capture: + config: @@ -1340,7 +1340,7 @@ production: &base # enabled: true # File that contains the secret key for verifying access for gitlab-kas. diff --git a/www/gitlab/pkg-message b/www/gitlab/pkg-message index 089734612436..64b201d3412a 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.3-freebsd.md +https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/install/18.4-freebsd.md EOM type: install } @@ -18,9 +18,9 @@ EOM { message: <<EOM If you just installed an major upgrade of GitLab, for example you -switched from 18.2.x to 18.3.x, please follow the instructions in the guide at: +switched from 18.3.x to 18.4.x, please follow the instructions in the guide at: -https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/18.2-18.3-freebsd.md +https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/18.3-18.4-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?202510261554.59QFsPmF090466>