diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index 683d9ddc1cc4..751c46613f9e 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,58 +1,58 @@ PORTNAME= gitaly DISTVERSIONPREFIX= v DISTVERSION= ${GITLAB_VERSION} PORTREVISION= ${GITLAB_PORTREVISION} # modify it in www/gitlab/Makefile.common CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org COMMENT= Smart reverse proxy for GitLab WWW= https://gitlab.com/gitlab-org/gitaly LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= bash>0:shells/bash \ ${LOCALBASE}/bin/cmake:devel/cmake-core \ pcre2>0:devel/pcre2 \ http-parser>0:www/http-parser LIB_DEPENDS= libcurl.so:ftp/curl \ libiconv.so:converters/libiconv \ libpcre2-8.so:devel/pcre2 -USES= cpe gmake go:modules,no_targets,1.23 iconv pkgconfig +USES= cpe gmake go:modules,no_targets,1.24 iconv pkgconfig CPE_VENDOR= gitlab USE_GITLAB= yes GL_ACCOUNT= gitlab-org 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 MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" # make sure to pass go build options into make process MAKE_ENV+= ${GO_ENV} # parallel build failed in my tests, so disable it here MAKE_JOBS_UNSAFE=yes post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example ${MV} ${WRKSRC}/config.toml.example ${WRKSRC}/config.toml.sample do-install: ${MKDIR} ${STAGEDIR}${DATADIR}/bin ${FIND} ${WRKSRC} -name '*.orig' -delete (cd ${WRKSRC}/_build/bin/ && ${COPYTREE_BIN} . ${STAGEDIR}${DATADIR}/bin && \ cd ${WRKSRC} && ${COPYTREE_SHARE} config.toml.sample ${STAGEDIR}${DATADIR}) post-install: ${FIND} -s ${STAGEDIR}${DATADIR} -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' | \ ${SED} -E -e '/sample$$/ s#^#@sample #; \ /gitlab-shell-hook$$/ s#^#@(,,755) #; \ s#${DATADIR_REL}/bin#@(,,555) ${DATADIR_REL}/bin#; ' >> ${TMPPLIST} .include "${.CURDIR}/../../www/gitlab/Makefile.common" .include diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index f22c2c980aa1..87b558e17743 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,9 +1,9 @@ -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 +TIMESTAMP = 1761544111 +SHA256 (go/devel_gitaly/gitaly-v18.5.1/go.mod) = 103dce63500bcc4d831877292de059e6aff0001c595bd10a20458e1c4b191dfc +SIZE (go/devel_gitaly/gitaly-v18.5.1/go.mod) = 13012 +SHA256 (go/devel_gitaly/gitaly-v18.5.1/gitaly-v18.5.1.tar.bz2) = c78f6f5a5f386d1212b576ff097de723a08b0b283d1fd74c6c456ae6c6c00c53 +SIZE (go/devel_gitaly/gitaly-v18.5.1/gitaly-v18.5.1.tar.bz2) = 4605152 +SHA256 (go/devel_gitaly/gitaly-v18.5.1/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4 +SIZE (go/devel_gitaly/gitaly-v18.5.1/git-v2.50.0.tar.bz2) = 9249878 +SHA256 (go/devel_gitaly/gitaly-v18.5.1/gitlab-org-git-23466173824c0a0f835c0d790c2f38156ae6284a_GL0.tar.gz) = 01a4069b15e9262151b3b97f989d4939ba8966bd5269875add2a34806817c01a +SIZE (go/devel_gitaly/gitaly-v18.5.1/gitlab-org-git-23466173824c0a0f835c0d790c2f38156ae6284a_GL0.tar.gz) = 11745131 diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile index 23a5ae07d220..4ba333987427 100644 --- a/devel/gitlab-shell/Makefile +++ b/devel/gitlab-shell/Makefile @@ -1,65 +1,64 @@ PORTNAME= gitlab-shell -PORTVERSION= 14.45.2 +PORTVERSION= 14.45.3 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org COMMENT= GitLab Shell handles git commands for GitLab WWW= https://gitlab.com/gitlab-org/gitlab-shell LICENSE= MIT # GSSAPI support can maybe be removed by disable CGO: # https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/720 #BUILD_DEPENDS= heimdal>=0:security/heimdal USES= gmake go:modules,no_targets,1.24 pkgconfig USE_GITLAB= yes GL_ACCOUNT= gitlab-org GO_MOD_DIST= gitlab GO_MODULE= gitlab.com/gitlab-org/gitlab-shell/v14 MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" # make sure to pass go build options into make process MAKE_ENV+= ${GO_ENV} ALL_TARGET= build USERS= git GROUPS= git VARLOGDIR= /var/log/gitlab-shell PLIST_FILES+= "@dir(git,,755) ${VARLOGDIR}" post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.yml.example ${MV} ${WRKSRC}/config.yml.example ${WRKSRC}/config.yml.sample ${CP} ${WRKSRC}/config.yml.sample ${WRKSRC}/config.yml ${REINPLACE_CMD} -e 's|VERSION_STRING :=.*|VERSION_STRING := v${PORTVERSION}|g' ${WRKSRC}/Makefile pre-install: ${RM} -rf ${WRKSRC}/config.yml do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${DATADIR}/bin ${FIND} ${WRKSRC} -name '*.orig' -delete (cd ${WRKSRC}/bin/ && ${COPYTREE_BIN} . ${STAGEDIR}${DATADIR}/bin) .for x in CHANGELOG LICENSE README.md VERSION config.yml.sample ${INSTALL_DATA} ${WRKSRC}/${x} ${STAGEDIR}${DATADIR}/ .endfor .for x in support @${MKDIR} ${STAGEDIR}${DATADIR}/${x} (cd ${WRKSRC}/${x} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/${x}) .endfor @${MKDIR} ${STAGEDIR}${VARLOGDIR} post-install: ${FIND} -s ${STAGEDIR}${DATADIR} -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' | \ ${SED} -E -e '/sample$$/ s#^#@sample #; \ s#${DATADIR_REL}/bin#@(,,555) ${DATADIR_REL}/bin#; ' >> ${TMPPLIST} .include diff --git a/devel/gitlab-shell/distinfo b/devel/gitlab-shell/distinfo index 949919945f22..a3f2aaaa18a2 100644 --- a/devel/gitlab-shell/distinfo +++ b/devel/gitlab-shell/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1757515145 -SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.45.2/go.mod) = 2f53e0b638b11941c5aff12026a1dbb040150ef9e10d73d4368678a79c4550ec -SIZE (go/devel_gitlab-shell/gitlab-shell-v14.45.2/go.mod) = 6034 -SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.45.2/gitlab-shell-v14.45.2.tar.bz2) = 8684d13f7b23e860cdcd446ebac117d73276e0ce578c3afd5669fa950ec128b6 -SIZE (go/devel_gitlab-shell/gitlab-shell-v14.45.2/gitlab-shell-v14.45.2.tar.bz2) = 175277 +TIMESTAMP = 1761544437 +SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.45.3/go.mod) = 2f53e0b638b11941c5aff12026a1dbb040150ef9e10d73d4368678a79c4550ec +SIZE (go/devel_gitlab-shell/gitlab-shell-v14.45.3/go.mod) = 6034 +SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.45.3/gitlab-shell-v14.45.3.tar.bz2) = 4feb7508f8eb200296d9a975867bc6d759c6912583c0324afe02523339116208 +SIZE (go/devel_gitlab-shell/gitlab-shell-v14.45.3/gitlab-shell-v14.45.3.tar.bz2) = 173784 diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo index 6d21da0c5ac5..b7d4e8a88536 100644 --- a/net/gitlab-agent/distinfo +++ b/net/gitlab-agent/distinfo @@ -1,5 +1,5 @@ -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 +TIMESTAMP = 1761544127 +SHA256 (go/net_gitlab-agent/gitlab-agent-v18.5.1/v18.5.1.mod) = 67dbe3124c9bcd1856d46f400f4270face097bbf16f0080dd0ae9764c96a16c4 +SIZE (go/net_gitlab-agent/gitlab-agent-v18.5.1/v18.5.1.mod) = 9858 +SHA256 (go/net_gitlab-agent/gitlab-agent-v18.5.1/v18.5.1.zip) = 5e245d0c0651b9a1ce094b8cfad7c79b4c1760bfdf8e9cd1b0c5497ece3c6e8f +SIZE (go/net_gitlab-agent/gitlab-agent-v18.5.1/v18.5.1.zip) = 1955334 diff --git a/net/rubygem-gitlab-kas-grpc/distinfo b/net/rubygem-gitlab-kas-grpc/distinfo index 92fff2946ed1..255c74eaac68 100644 --- a/net/rubygem-gitlab-kas-grpc/distinfo +++ b/net/rubygem-gitlab-kas-grpc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1761293572 -SHA256 (rubygem/gitlab-kas-grpc-18.4.3.gem) = c40381ee46c49aad6b9c52dd31179b1d03e65976d7b43e00fb6f2d13ff2a4d4e -SIZE (rubygem/gitlab-kas-grpc-18.4.3.gem) = 11264 +TIMESTAMP = 1761544152 +SHA256 (rubygem/gitlab-kas-grpc-18.5.1.gem) = 518f5ce705b186358e9c8594f608672a3b87509efc0e357f5e0a82c66020bc0e +SIZE (rubygem/gitlab-kas-grpc-18.5.1.gem) = 11264 diff --git a/textproc/gitlab-elasticsearch-indexer/Makefile b/textproc/gitlab-elasticsearch-indexer/Makefile index c6b394b809fe..38c8305a584e 100644 --- a/textproc/gitlab-elasticsearch-indexer/Makefile +++ b/textproc/gitlab-elasticsearch-indexer/Makefile @@ -1,49 +1,49 @@ PORTNAME= gitlab-elasticsearch-indexer -PORTVERSION= 5.9.1 +PORTVERSION= 5.9.4 DISTVERSIONPREFIX= v PORTREVISION= 1 CATEGORIES= textproc MAINTAINER= mfechner@FreeBSD.org COMMENT= Elasticsearch indexer for GitLab WWW= https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md BUILD_DEPENDS= git>=2.38.1:devel/git \ gitlab-code-parser>=0.20.1:textproc/gitlab-code-parser LIB_DEPENDS= libicui18n.so:devel/icu \ libicuuc.so:devel/icu #RUN_DEPENDS= p5-Image-ExifTool>=0:graphics/p5-Image-ExifTool USES= gmake go:modules,no_targets,1.24 pkgconfig USE_GITLAB= yes GL_ACCOUNT= gitlab-org GO_MOD_DIST= gitlab GO_MODULE= gitlab.com/gitlab-org/gitlab-elasticsearch-indexer MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" # make sure to pass go build options into make process MAKE_ENV+= ${GO_ENV} PLIST_FILES= bin/${PORTNAME} post-patch: ${REINPLACE_CMD} -e '/libparser-download/d' ${WRKSRC}/Makefile # add a git tag, as that is required by the build script pre-build: cd ${WRKSRC} && \ git init && \ git config user.email "${MAINTAINER}" && \ git config user.name "Matthias Fechner" && \ git add . && \ git commit -m "tag" && \ git tag v${PORTVERSION} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include diff --git a/textproc/gitlab-elasticsearch-indexer/distinfo b/textproc/gitlab-elasticsearch-indexer/distinfo index 80fc5ce42357..05ffb8670a09 100644 --- a/textproc/gitlab-elasticsearch-indexer/distinfo +++ b/textproc/gitlab-elasticsearch-indexer/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1760863690 -SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.9.1/go.mod) = 2e0b9a25180c393a82721cd956e58eb1306e1e57d2d2e5c52dcdd68732748d10 -SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.9.1/go.mod) = 5684 -SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.9.1/gitlab-elasticsearch-indexer-v5.9.1.tar.bz2) = db1023b7a4e1d852de474b40c89347d40f52beeeecec5ce2e504b4110244acdd -SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.9.1/gitlab-elasticsearch-indexer-v5.9.1.tar.bz2) = 112275 +TIMESTAMP = 1761544321 +SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.9.4/go.mod) = 95d57e7bd82c01ad7b3e92d303cc7073dd26f42da88859941a45f2b068d640d1 +SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.9.4/go.mod) = 5684 +SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.9.4/gitlab-elasticsearch-indexer-v5.9.4.tar.bz2) = bb5f836c2bdc4a735342990ce8518a00f02a29061065d1d3334ee6ac98fc65d2 +SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.9.4/gitlab-elasticsearch-indexer-v5.9.4.tar.bz2) = 114252 diff --git a/textproc/gitlab-zoekt-indexer/Makefile b/textproc/gitlab-zoekt-indexer/Makefile index fbb8a81f0cbc..7b54375d9e28 100644 --- a/textproc/gitlab-zoekt-indexer/Makefile +++ b/textproc/gitlab-zoekt-indexer/Makefile @@ -1,46 +1,46 @@ PORTNAME= gitlab-zoekt-indexer -PORTVERSION= 1.4.4 +PORTVERSION= 1.6.2 DISTVERSIONPREFIX= v PORTREVISION= 1 CATEGORIES= textproc MAINTAINER= mfechner@FreeBSD.org COMMENT= Zoekt search solution for Gitlab WWW= https://gitlab.com/gitlab-org/gitlab-zoekt-indexer LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md BUILD_DEPENDS= git>=2.38.1:devel/git #LIB_DEPENDS= libicui18n.so:devel/icu \ # libicuuc.so:devel/icu #RUN_DEPENDS= p5-Image-ExifTool>=0:graphics/p5-Image-ExifTool USES= gmake go:modules,no_targets,1.24 pkgconfig USE_GITLAB= yes GL_ACCOUNT= gitlab-org GO_MOD_DIST= gitlab GO_MODULE= gitlab.com/gitlab-org/gitlab-zoekt-indexer MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" # make sure to pass go build options into make process MAKE_ENV+= ${GO_ENV} ALL_TARGET= build-unified PLIST_FILES= bin/gitlab-zoekt # add a git tag, as that is required by the build script pre-build: cd ${WRKSRC} && \ git init && \ git config user.email "${MAINTAINER}" && \ git config user.name "Matthias Fechner" && \ git add . && \ git commit -m "tag" && \ git tag v${PORTVERSION} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/gitlab-zoekt ${STAGEDIR}${PREFIX}/bin/gitlab-zoekt .include diff --git a/textproc/gitlab-zoekt-indexer/distinfo b/textproc/gitlab-zoekt-indexer/distinfo index 777a1a226062..c385038e9185 100644 --- a/textproc/gitlab-zoekt-indexer/distinfo +++ b/textproc/gitlab-zoekt-indexer/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1761392321 -SHA256 (go/textproc_gitlab-zoekt-indexer/gitlab-zoekt-indexer-v1.4.4/go.mod) = 66d3dcff40a12cf2990dccb61a8a625183d34b2291127120a09bcf343e1bdac8 -SIZE (go/textproc_gitlab-zoekt-indexer/gitlab-zoekt-indexer-v1.4.4/go.mod) = 7078 -SHA256 (go/textproc_gitlab-zoekt-indexer/gitlab-zoekt-indexer-v1.4.4/gitlab-zoekt-indexer-v1.4.4.tar.bz2) = 7764f7ba415d7e7b90a994b966ad22a7d361c1fe932f228e58363afae4a5a653 -SIZE (go/textproc_gitlab-zoekt-indexer/gitlab-zoekt-indexer-v1.4.4/gitlab-zoekt-indexer-v1.4.4.tar.bz2) = 852570 +TIMESTAMP = 1761544521 +SHA256 (go/textproc_gitlab-zoekt-indexer/gitlab-zoekt-indexer-v1.6.2/go.mod) = 2c8ab84c55bbe330520a870b14f460877a3bac73a9639ece1bee64bf945c5fa8 +SIZE (go/textproc_gitlab-zoekt-indexer/gitlab-zoekt-indexer-v1.6.2/go.mod) = 6877 +SHA256 (go/textproc_gitlab-zoekt-indexer/gitlab-zoekt-indexer-v1.6.2/gitlab-zoekt-indexer-v1.6.2.tar.bz2) = 9c0f0f4543f415d360bce2ddbe8e0eefda8cc8a55ff29c0765d9cf1bbacd0c70 +SIZE (go/textproc_gitlab-zoekt-indexer/gitlab-zoekt-indexer-v1.6.2/gitlab-zoekt-indexer-v1.6.2.tar.bz2) = 847602 diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo index 444bdef2a0d2..88dcd2ed4e9a 100644 --- a/www/gitlab-pages/distinfo +++ b/www/gitlab-pages/distinfo @@ -1,5 +1,5 @@ -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 +TIMESTAMP = 1761544139 +SHA256 (go/www_gitlab-pages/gitlab-pages-v18.5.1/go.mod) = ac8a9352d8b2a358be9c716c703e89a2b1623b7abd3d9738213b2e0d50baef8b +SIZE (go/www_gitlab-pages/gitlab-pages-v18.5.1/go.mod) = 3416 +SHA256 (go/www_gitlab-pages/gitlab-pages-v18.5.1/gitlab-pages-v18.5.1.tar.bz2) = acfc2e21f27a50102dec97ae97c23e051ff2913b6b8fae52acd11d54d0e9f461 +SIZE (go/www_gitlab-pages/gitlab-pages-v18.5.1/gitlab-pages-v18.5.1.tar.bz2) = 236838 diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index 7740761377a4..7e266cc07228 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,5 +1,5 @@ -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 +TIMESTAMP = 1761544152 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.5.1/go.mod) = 39650d5ecf720c85d09f111d574d56810f1d80074f1efb4fabac0db4c369d717 +SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.5.1/go.mod) = 9343 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.5.1/gitlab-foss-v18.5.1.tar.bz2) = 50f60927372f380930fc6a6b5b9bf3093c6b043ad488b8e5b941a8ca5bec5c91 +SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.5.1/gitlab-foss-v18.5.1.tar.bz2) = 122919401 diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 191c53d788c9..9f1d2ba74b69 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -1,580 +1,580 @@ PORTNAME= gitlab-${FLAVOR:Uce} PORTVERSION= ${GITLAB_VERSION} DISTVERSIONPREFIX= v .if ${FLAVOR:U} == ee DISTVERSIONSUFFIX= -ee .endif PORTREVISION= ${GITLAB_PORTREVISION} # modify it in www/gitlab/Makefile.common CATEGORIES= www devel # include patch to fix database migration #https://gitlab.com/gitlab-org/gitlab/-/merge_requests/153560.patch #PATCH_SITES= https://gitlab.com/gitlab-org/gitlab/-/merge_requests/ #PATCHFILES+= 153560.patch:-p1 # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/153560 MAINTAINER= mfechner@FreeBSD.org COMMENT= Web GUI for managing git repositories WWW= https://gitlab.com/ \ https://gitlab.com/gitlab-org/gitlab LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE # the rubygems of RUN_DEPENDS matches the order of the Gemfile # which makes maintaining this long list much easier! # devel/rubygem-parser is required for database upgrade process # see https://gitlab.com/gitlab-org/gitlab/-/issues/350866 # 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 #gitlab-zoekt-indexer>=0.16.0:textproc/gitlab-zoekt-indexer MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ - gitlab-elasticsearch-indexer>=5.9.1:textproc/gitlab-elasticsearch-indexer \ + gitlab-elasticsearch-indexer>=5.9.4: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-shell>=14.45.3:devel/gitlab-shell \ gitlab-workhorse>=${GITLAB_VERSION}:www/gitlab-workhorse \ - gitlab-zoekt-indexer>=1.4.4:textproc/gitlab-zoekt-indexer \ + gitlab-zoekt-indexer>=1.6.2:textproc/gitlab-zoekt-indexer \ redis>=6.2.11:databases/redis \ yarn${NODEJS_SUFFIX}>=1.10.0:www/yarn${NODEJS_SUFFIX} \ gtar>0:archivers/gtar \ bash>0:shells/bash \ rubygem-parser>=3.3.9.0: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 \ rubygem-rails-gitlab>=7.1.5.1<7.2:www/rubygem-rails-gitlab \ rubygem-mutex_m>=0.3<1:devel/rubygem-mutex_m \ rubygem-drb-gitlab>=2.2.3<3:devel/rubygem-drb-gitlab \ rubygem-bootsnap>=1.18.6<1.19:devel/rubygem-bootsnap \ rubygem-ffi>=1.17.2<2:devel/rubygem-ffi \ - rubygem-openssl>=3.3.0<4:security/rubygem-openssl \ - rubygem-gitlab-secret_detection>=0.33.0<1:security/rubygem-gitlab-secret_detection \ + rubygem-openssl>=3.3.1<4:security/rubygem-openssl \ + rubygem-gitlab-secret_detection>=0.35.1<1:security/rubygem-gitlab-secret_detection \ rubygem-responders-rails-gitlab>=3.0<4.0:www/rubygem-responders-rails-gitlab \ 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-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-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.2<3.5:textproc/rubygem-rexml \ + rubygem-rexml>=3.4.4<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 \ rubygem-omniauth-auth0-gitlab>=3.1.1<3.2.0:net/rubygem-omniauth-auth0-gitlab \ rubygem-omniauth-azure-activedirectory-v2>=2.0<3:net/rubygem-omniauth-azure-activedirectory-v2 \ rubygem-omniauth-alicloud>=3.0.0<3.1:security/rubygem-omniauth-alicloud \ rubygem-omniauth-github-gitlab>=2.0.1<2.1:net/rubygem-omniauth-github-gitlab \ rubygem-omniauth-google-oauth2-gitlab>=1.1<2:net/rubygem-omniauth-google-oauth2-gitlab \ rubygem-omniauth-oauth2-generic-gitlab>=0.2.2<0.3.0:security/rubygem-omniauth-oauth2-generic-gitlab \ rubygem-omniauth-shibboleth-redux-gitlab>=2.0<3:security/rubygem-omniauth-shibboleth-redux-gitlab \ rubygem-omniauth_openid_connect>=0.8.0<0.9:net/rubygem-omniauth_openid_connect \ rubygem-openid_connect>=2.3.1<2.4:net/rubygem-openid_connect \ rubygem-omniauth-atlassian-oauth2>=0.2.0<0.3:security/rubygem-omniauth-atlassian-oauth2 \ rubygem-rack-oauth2-gitlab>=2.2.1<2.3:security/rubygem-rack-oauth2-gitlab \ rubygem-jwt2>=2.10.2<2.11:www/rubygem-jwt2 \ rubygem-gssapi>=1.3.1<1.4:security/rubygem-gssapi \ 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-rqrcode-gitlab>=2.2.0<3:www/rubygem-rqrcode-gitlab \ rubygem-attr_encrypted>=4.2<5:security/rubygem-attr_encrypted \ rubygem-validates_hostname-gitlab>=1.0.13<1.1.0:dns/rubygem-validates_hostname-gitlab \ rubygem-rubyzip-gitlab>=2.4.1<2.5:archivers/rubygem-rubyzip-gitlab \ - rubygem-acme-client-gitlab>=2.0.25<3:security/rubygem-acme-client-gitlab \ + rubygem-acme-client-gitlab>=2.0.26<3:security/rubygem-acme-client-gitlab \ 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.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 \ rubygem-grape-swagger>=2.1.2<2.2:devel/rubygem-grape-swagger \ rubygem-grape-swagger-entity>=0.5.5<0.6: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-ffaker>=2.24.0<3:devel/rubygem-ffaker \ + rubygem-ffaker>=2.25.0<3:devel/rubygem-ffaker \ rubygem-hashie>=5.0.0<5.1:devel/rubygem-hashie \ rubygem-kaminari-rails-gitlab>=1.2.2<1.3:www/rubygem-kaminari-rails-gitlab \ 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.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.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.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.90.0<0.91:devel/rubygem-google-apis-container_v1beta1 \ + rubygem-google-apis-container_v1beta1>=0.91.0<0.92: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-cloudresourcemanager_v1-gitlab>=0.44.0<0.45: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.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 \ rubygem-seed-fu-gitlab>=2.3.9<2.4.0:databases/rubygem-seed-fu-gitlab \ rubygem-elasticsearch-model-gitlab>=7.2<8:textproc/rubygem-elasticsearch-model-gitlab \ 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.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 \ rubygem-typhoeus-gitlab>=1.4.0<1.5:www/rubygem-typhoeus-gitlab \ rubygem-html-pipeline-gitlab>=2.14.3<2.15:textproc/rubygem-html-pipeline-gitlab \ rubygem-deckar01-task_list-gitlab>=2.3.4<2.4:www/rubygem-deckar01-task_list-gitlab \ rubygem-gitlab-markup>=2.0.0<2.1:textproc/rubygem-gitlab-markup \ - rubygem-commonmarker0>=0.23.10<0.24:textproc/rubygem-commonmarker0 \ + rubygem-commonmarker0>=0.23.12<0.24:textproc/rubygem-commonmarker0 \ rubygem-kramdown-gitlab>=2.5.1<2.6:textproc/rubygem-kramdown-gitlab \ rubygem-redcloth>=4.3.3<4.4.0:www/rubygem-redcloth \ rubygem-org-ruby>=0.9.12<0.10.0:textproc/rubygem-org-ruby \ rubygem-creole>=0.5.0<0.6.0:textproc/rubygem-creole \ rubygem-wikicloth081>=0.8.1<0.8.2:textproc/rubygem-wikicloth081 \ rubygem-asciidoctor>=2.0.18<2.1.0:textproc/rubygem-asciidoctor \ rubygem-asciidoctor-include-ext>=0.4.0<0.5.0:textproc/rubygem-asciidoctor-include-ext \ rubygem-asciidoctor-plantuml00>=0.0.16<0.1:textproc/rubygem-asciidoctor-plantuml00 \ rubygem-asciidoctor-kroki>=0.10.0<0.11:textproc/rubygem-asciidoctor-kroki \ - rubygem-rouge-gitlab>=4.6.0<4.7:textproc/rubygem-rouge-gitlab \ + rubygem-rouge-gitlab>=4.6.1<4.7:textproc/rubygem-rouge-gitlab \ rubygem-truncato>=0.7.13<0.8.0:textproc/rubygem-truncato \ - rubygem-nokogiri>=1.18.9<2:textproc/rubygem-nokogiri \ - rubygem-gitlab-glfm-markdown>=0.0.33<0.1:textproc/rubygem-gitlab-glfm-markdown \ + rubygem-nokogiri>=1.18.10<2:textproc/rubygem-nokogiri \ + rubygem-gitlab-glfm-markdown>=0.0.36<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-diffy>=3.4.4<4:textproc/rubygem-diffy \ - rubygem-rack22>=2.2.17,3<2.3,3:www/rubygem-rack22 \ + rubygem-rack22>=2.2.18,3<2.3,3:www/rubygem-rack22 \ rubygem-rack-timeout>=0.7.0<0.8:www/rubygem-rack-timeout \ rubygem-puma-gitlab>=6.6.1<6.6.2:www/rubygem-puma-gitlab \ rubygem-sd_notify>=0.1.1<0.2:devel/rubygem-sd_notify \ 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-fugit-gitlab>=1.11.2<1.12:devel/rubygem-fugit-gitlab \ 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 \ - rubygem-re2>=2.19.0<3:devel/rubygem-re2 \ + rubygem-re2>=2.20.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.0<5.4.1:databases/rubygem-redis-gitlab \ - rubygem-redis-client>=0.25.1<1:databases/rubygem-redis-client \ + rubygem-redis-client>=0.26.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.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 \ rubygem-slack-messenger>=2.3.5<2.4.0:devel/rubygem-slack-messenger \ rubygem-kubeclient>=4.12.0<4.13.0:www/rubygem-kubeclient \ rubygem-ruby-openai37>=3.7<4:www/rubygem-ruby-openai37 \ 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>=2.24.1<2.25:textproc/rubygem-loofah \ 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 \ rubygem-fast_blank>=1.0.1<1.1:devel/rubygem-fast_blank \ rubygem-gitlab-chronic>=0.10.6<0.11.0:devel/rubygem-gitlab-chronic \ rubygem-gitlab_chronic_duration>=0.12<1:devel/rubygem-gitlab_chronic_duration \ 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.5.1<0.6:databases/rubygem-click_house-client \ + rubygem-click_house-client>=0.8.0<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 \ rubygem-base32>=0.3.4<0.4.0:converters/rubygem-base32 \ rubygem-gitlab-license>=2.6<3:devel/rubygem-gitlab-license \ rubygem-rack-attack>=6.7.0<6.8:www/rubygem-rack-attack \ 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-premailer-rails-rails-gitlab>=1.12.0<1.13:mail/rubygem-premailer-rails-rails-gitlab \ - rubygem-gitlab-labkit>=0.40.0<0.41:devel/rubygem-gitlab-labkit \ + rubygem-gitlab-labkit>=0.42.0<0.43: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 \ rubygem-gettext>=3.5.1<4:devel/rubygem-gettext \ rubygem-batch-loader>=2.0.5<2.1:devel/rubygem-batch-loader \ rubygem-tty-prompt>=0.23<1:devel/rubygem-tty-prompt \ 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-async-gitlab>=2.28.0<2.29:devel/rubygem-async-gitlab \ + 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 \ 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 \ rubygem-opentelemetry-instrumentation-action_pack>=0.10.0:devel/rubygem-opentelemetry-instrumentation-action_pack \ rubygem-opentelemetry-instrumentation-active_job>=0.7.7:devel/rubygem-opentelemetry-instrumentation-active_job \ rubygem-opentelemetry-instrumentation-active_record>=0.8.1:devel/rubygem-opentelemetry-instrumentation-active_record \ rubygem-opentelemetry-instrumentation-action_view>=0.7.2:devel/rubygem-opentelemetry-instrumentation-action_view \ rubygem-opentelemetry-instrumentation-aws_sdk>=0.5.4:devel/rubygem-opentelemetry-instrumentation-aws_sdk \ rubygem-opentelemetry-instrumentation-http>=0.23.4:devel/rubygem-opentelemetry-instrumentation-http \ rubygem-opentelemetry-instrumentation-concurrent_ruby>=0.21.4:devel/rubygem-opentelemetry-instrumentation-concurrent_ruby \ rubygem-opentelemetry-instrumentation-ethon>=0.21.9:devel/rubygem-opentelemetry-instrumentation-ethon \ rubygem-opentelemetry-instrumentation-excon>=0.22.5:devel/rubygem-opentelemetry-instrumentation-excon \ rubygem-opentelemetry-instrumentation-faraday>=0.24.7:devel/rubygem-opentelemetry-instrumentation-faraday \ rubygem-opentelemetry-instrumentation-grape>=0.2.0:devel/rubygem-opentelemetry-instrumentation-grape \ rubygem-opentelemetry-instrumentation-graphql>=0.28.4:devel/rubygem-opentelemetry-instrumentation-graphql \ rubygem-opentelemetry-instrumentation-http_client>=0.22.8:devel/rubygem-opentelemetry-instrumentation-http_client \ rubygem-opentelemetry-instrumentation-net_http>=0.22.8:devel/rubygem-opentelemetry-instrumentation-net_http \ rubygem-opentelemetry-instrumentation-pg>=0.29.1:devel/rubygem-opentelemetry-instrumentation-pg \ rubygem-opentelemetry-instrumentation-rack>=0.24.6:devel/rubygem-opentelemetry-instrumentation-rack \ rubygem-opentelemetry-instrumentation-rails>=0.33.1:devel/rubygem-opentelemetry-instrumentation-rails \ rubygem-opentelemetry-instrumentation-rake>=0.2.1:devel/rubygem-opentelemetry-instrumentation-rake \ rubygem-opentelemetry-instrumentation-redis>=0.25.7:devel/rubygem-opentelemetry-instrumentation-redis \ rubygem-opentelemetry-instrumentation-sidekiq>=0.25.7:devel/rubygem-opentelemetry-instrumentation-sidekiq \ 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-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-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-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 \ rubygem-vmstat>=2.3.1<2.4.0:sysutils/rubygem-vmstat \ rubygem-sys-filesystem14>=1.4.3<1.5:sysutils/rubygem-sys-filesystem14 \ rubygem-net-ntp>0:net/rubygem-net-ntp \ - rubygem-ssh_data>=1.3<2:security/rubygem-ssh_data \ + rubygem-ssh_data>=2.0<3:security/rubygem-ssh_data \ rubygem-spamcheck>=1.3.3<1.4:net/rubygem-spamcheck \ - rubygem-gitaly>=18.4.0:net/rubygem-gitaly \ + rubygem-gitaly>=18.4.1: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-grpc-gitlab>=1.75.0<1.76:net/rubygem-grpc-gitlab \ rubygem-google-protobuf3>=3.25.8<4:devel/rubygem-google-protobuf3 \ rubygem-toml-rb>=2.2.0<3: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-unleash>=3.2.2<3.3:devel/rubygem-unleash \ - rubygem-gitlab-experiment>=0.9.1<0.10:devel/rubygem-gitlab-experiment \ + rubygem-gitlab-experiment>=1.0.0<1.1:devel/rubygem-gitlab-experiment \ rubygem-lograge-rails-gitlab>=0.11.2<1.0:www/rubygem-lograge-rails-gitlab \ rubygem-grape_logging-gitlab>=1.8.4<2.0:devel/rubygem-grape_logging-gitlab \ rubygem-gitlab-net-dns>=0.15.0<0.16:dns/rubygem-gitlab-net-dns \ rubygem-countries>=4.1.3<4.2.0:devel/rubygem-countries \ rubygem-retriable>=3.1.2<3.2.0:devel/rubygem-retriable \ rubygem-lru_redux>0:devel/rubygem-lru_redux \ rubygem-mail>=2.8.1<2.8.2,2:mail/rubygem-mail \ rubygem-lockbox>=1.4.1<1.5:security/rubygem-lockbox \ rubygem-valid_email>=0.1<1:mail/rubygem-valid_email \ rubygem-jsonb_accessor>=1.4<2:www/rubygem-jsonb_accessor \ rubygem-json-gitlab>=2.13.1<2.14:devel/rubygem-json-gitlab \ 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_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 \ rubygem-parslet1>=1.8<2:textproc/rubygem-parslet1 \ 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.8<0.5:net/rubygem-devfile \ - rubygem-hashdiff>=1.2.0<1.3:devel/rubygem-hashdiff \ + 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 \ 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 \ rubygem-uri-gitlab>=0.13.2<0.13.3:net/rubygem-uri-gitlab \ rubygem-duo_api>=1.4<2:security/rubygem-duo_api \ rubygem-gitlab-sdk>=0.3.0<0.4:devel/rubygem-gitlab-sdk \ rubygem-paper_trail>=16.0<17:devel/rubygem-paper_trail \ rubygem-i18n_data>=0.13.1<1:devel/rubygem-i18n_data \ - rubygem-gitlab-cloud-connector>=1.26<2:security/rubygem-gitlab-cloud-connector \ + rubygem-gitlab-cloud-connector>=1.33<2:security/rubygem-gitlab-cloud-connector \ 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 BUILD_DEPENDS= gem:devel/ruby-gems \ ${MY_DEPENDS} RUN_DEPENDS= gmake>=4.4.1:devel/gmake \ ${MY_DEPENDS} FLAVORS= ce ee FLAVOR?= ${FLAVORS:[1]} USES= nodejs:env python:run ruby shebangfix USE_GITLAB= yes GL_ACCOUNT= gitlab-org .if ${FLAVOR:U} == ee GL_PROJECT= gitlab .else # ce GL_PROJECT= gitlab-foss .endif USE_RC_SUBR= gitlab SHEBANG_FILES= gems/bundler-checksum/test/project_with_checksum_lock/scripts/test \ scripts/aigw-tagging.sh \ scripts/build_assets_image \ scripts/build_qa_image \ scripts/build_gdk_image \ scripts/compile_assets \ scripts/db_tasks \ scripts/rails-update-bisect \ scripts/frontend/codemods/vuex-to-pinia/migrate.sh \ scripts/frontend/execute-on-staged-files.sh \ scripts/frontend/start_storybook.sh \ scripts/validate-monorepo-gem \ .lefthook/gitleaks.sh \ .lefthook/pre-push/merge_conflicts \ qa/gdk/entrypoint \ qa/bin/test \ vendor/gems/sidekiq/scripts/update-sidekiq.sh CONFLICTS_INSTALL= gitolite \ gitolite2 \ gogs \ gitea \ gitosis # We install the CE and EE flavor in the same directory WWWDIR= ${PREFIX}/www/gitlab NO_ARCH= yes NO_BUILD= yes USERS= git GROUPS= git OPTIONS_DEFINE= KERBEROS OPTIONS_DEFAULT= KERBEROS KERBEROS_BUILD_DEPENDS= rubygem-timfel-krb5-auth>=0.8<1:security/rubygem-timfel-krb5 KERBEROS_RUN_DEPENDS= rubygem-timfel-krb5-auth>=0.8<1:security/rubygem-timfel-krb5 KERBEROS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Gemfile-kerberos-off post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" -e "s|%%LOCALBASE%%|${LOCALBASE}|" -e "s|%%WWWDIR%%|${WWWDIR}|" ${WRKSRC}/config/gitlab.yml.example \ ${WRKSRC}/config/puma.rb.example \ ${WRKSRC}/lib/support/nginx/gitlab \ ${WRKSRC}/lib/support/nginx/gitlab-ssl # Remove symlink a create a file with content ${RM} ${WRKSRC}/GITLAB_WORKHORSE_VERSION ${ECHO} ${PORTVERSION} > ${WRKSRC}/GITLAB_WORKHORSE_VERSION do-install: ${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample # TODO: Vendored gems are installing binaries not into STAGEDIR, this needs to be fixed. # As intermediate solution, the binaries are not disabled by patches #(cd ${WRKSRC} && ${RM} Gemfile.lock && bundle config set path ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER} && ${WRK_ENV} ${GEM_ENV} bundle install --local) (cd ${WRKSRC} && bundle config set --local bin .bin) # should skip development and test, but does not work #(cd ${WRKSRC} && bundle config set --local without development test) #(cd ${WRKSRC} && cat .bundle/config) (cd ${WRKSRC} && ${RM} Gemfile.lock && ${WRK_ENV} ${GEM_ENV} bundle install --local) (cd ${WRKSRC} && bundle binstubs --all --path .bin) ${RM} -R ${WRKSRC}/workhorse # remove vendored sidekiq gem as it breaks gitlab 17.1.0 for FreeBSD # See also: https://gitlab.com/gitlab-org/gitlab/-/issues/468435 #${RM} -R ${WRKSRC}/vendor/gems/sidekiq-7.1.6 ${FIND} ${WRKSRC} -name '*.orig' -delete ${FIND} ${WRKSRC} -name '*.bak' -delete ${FIND} ${WRKSRC} -name '*.gitkeep' -delete ${FIND} ${WRKSRC} -name '*.gitignore' -delete ${FIND} ${WRKSRC} -name "Gemfile.lock" -delete ${MV} ${WRKSRC}/config/initializers/relative_url.rb.sample ${WRKSRC}/config/initializers/relative_url.rb.example # get files for workdir with: find . -name "*.example" | sort ${MV} ${WRKSRC}/config/cable.yml.example ${WRKSRC}/config/cable.yml.sample ${MV} ${WRKSRC}/config/gitlab.yml.example ${WRKSRC}/config/gitlab.yml.sample ${MV} ${WRKSRC}/config/initializers/devise_password_length.rb.example ${WRKSRC}/config/initializers/devise_password_length.rb.sample ${MV} ${WRKSRC}/config/puma.rb.example ${WRKSRC}/config/puma.rb.sample ${MV} ${WRKSRC}/config/redis.yml.example ${WRKSRC}/config/redis.yml.sample ${MV} ${WRKSRC}/config/resque.yml.example ${WRKSRC}/config/resque.yml.sample ${MV} ${WRKSRC}/config/secrets.yml.example ${WRKSRC}/config/secrets.yml.sample ${MV} ${WRKSRC}/config/session_store.yml.example ${WRKSRC}/config/session_store.yml.sample ${MV} ${WRKSRC}/config/sidekiq.yml.example ${WRKSRC}/config/sidekiq.yml.sample ${MV} ${WRKSRC}/lib/support/nginx/gitlab ${WRKSRC}/lib/support/nginx/gitlab.sample ${MV} ${WRKSRC}/lib/support/nginx/gitlab-ssl ${WRKSRC}/lib/support/nginx/gitlab-ssl.sample ${MV} ${WRKSRC}/public/robots.txt ${WRKSRC}/public/robots.txt.sample ${MKDIR} ${STAGEDIR}${WWWDIR}/app/assets/builds ${MKDIR} ${STAGEDIR}${WWWDIR}/config/helpers/tailwind ${MKDIR} ${STAGEDIR}${WWWDIR}/public/assets ${MKDIR} ${STAGEDIR}${WWWDIR}/public/uploads ${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/cache ${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/sessions ${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/backups ${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/sockets/private/internal ${MKDIR} ${STAGEDIR}${WWWDIR}/shared/external-diffs ${MKDIR} ${STAGEDIR}${WWWDIR}/shared/tmp ${MKDIR} ${STAGEDIR}${WWWDIR}/shared/artifacts/tmp/work ${MKDIR} ${STAGEDIR}${WWWDIR}/vendor/assets/stylesheets ${MKDIR} ${STAGEDIR}${WWWDIR}/workhorse/changelogs/unreleased # Skip file having an executable bit (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} "-not ( -type f -perm -a=x )") # now copy all files having an execution bit and preserve to x bit (this fixes some issues we saw) (cd ${WRKSRC} && ${COPYTREE_BIN} . ${STAGEDIR}${WWWDIR} "-type f -perm -a=x") post-install: ${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' | \ ${SED} -E -e '/sample$$/ s#^#@sample #; \ /secrets.yml.sample$$/ s#^@sample #@sample(git,www,0600) #; \ /database.yml.sample$$/ s#^@sample #@sample(git,www,0600) #; \ s#${WWWDIR_REL}/bin#@(git,,544) ${WWWDIR_REL}/bin#; \ /db\/schema.rb$$|gitlab.po$$|gitlab.pot$$|gitlab.po.time_stamp$$|locale\/index.js$$/ s#^#@(git,,) #;' >> ${TMPPLIST} @${ECHO_CMD} "@owner git" >> ${TMPPLIST} @${ECHO_CMD} "@group www" >> ${TMPPLIST} @${ECHO_CMD} "@dir(git,git) ${WWWDIR_REL}/" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/builds/" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/images/auth_buttons/" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/javascripts/locale/" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/javascripts/pipeline_wizard/templates/" >> ${TMPPLIST} @${ECHO_CMD} "@dir(git,git,554) ${WWWDIR_REL}/bin" >> ${TMPPLIST} @${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(,,744) ${WWWDIR_REL}/locale" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/lib/assets" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/bg" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/de" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/eo" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/es" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/fil_PH" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/fr" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/id_ID" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/it" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/ja" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/ko" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/nl_NL" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/pl_PL" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/pt_BR" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/ru" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/tr_TR" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/uk" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/zh_CN" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/zh_HK" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/locale/zh_TW" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/log" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/public" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/public/assets" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/public/uploads" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/2_plan" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/4_verify" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/5_package" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/8_monitor" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/browser_ui/5_package" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/browser_ui/8_monitor" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/tmp" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/spec/support/gitlab-git-test.git/refs/heads" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/spec/support/gitlab-git-test.git/refs/tags" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,755) ${WWWDIR_REL}/shared" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts/tmp" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts/tmp/work" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/ci_secure_files" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/shared/packages" >> ${TMPPLIST} @${ECHO_CMD} "@group gitlab-pages" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/shared/pages" >> ${TMPPLIST} @${ECHO_CMD} "@group www" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/terraform_state" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/external-diffs" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/tmp" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/lfs-objects" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/registry" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/backups" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/cache" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/feature_flags" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/pids" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir/puma" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir/sidekiq" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/prometheus_multiproc_dir/unicorn" >> ${TMPPLIST} #@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/run" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sessions" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sockets" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sockets/private" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sockets/private/internal" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/vendor" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/vendor/assets" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/vendor/assets/stylesheets" >> ${TMPPLIST} @${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} @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/qa/qa/specs/features/ee/api/8_monitor" >> ${TMPPLIST} .endif .if !defined(_GITLAB_MAKESUM_GUARD) makesum: ${MAKE} -D_GITLAB_MAKESUM_GUARD makesum DISTINFO_FILE=${.CURDIR}/distinfo FLAVOR=ce ${MAKE} -D_GITLAB_MAKESUM_GUARD makesum DISTINFO_FILE=${.CURDIR}/distinfo.ee FLAVOR=ee ${CAT} ${.CURDIR}/distinfo.ee >> ${.CURDIR}/distinfo ${RM} ${.CURDIR}/distinfo.ee (cd ../../devel/gitaly && ${MAKE} makesum) (cd ../../net/gitlab-agent && ${MAKE} makesum) (cd ../../www/gitlab-pages && ${MAKE} makesum) (cd ../../www/gitlab-workhorse && ${MAKE} makesum) (cd ../../net/rubygem-gitlab-kas-grpc && ${MAKE} makesum) (cd ../../www/rubygem-rails-gitlab && ${MAKE} makesum) (cd ../../www/rubygem-actioncable-gitlab && ${MAKE} makesum) (cd ../../mail/rubygem-actionmailbox-gitlab && ${MAKE} makesum) (cd ../../mail/rubygem-actionmailer-gitlab && ${MAKE} makesum) (cd ../../www/rubygem-actionpack-gitlab && ${MAKE} makesum) (cd ../../textproc/rubygem-actiontext-gitlab && ${MAKE} makesum) (cd ../../devel/rubygem-actionview-gitlab && ${MAKE} makesum) (cd ../../devel/rubygem-activejob-gitlab && ${MAKE} makesum) (cd ../../databases/rubygem-activemodel-gitlab && ${MAKE} makesum) (cd ../../databases/rubygem-activerecord-gitlab && ${MAKE} makesum) (cd ../../net/rubygem-activestorage-gitlab && ${MAKE} makesum) (cd ../../devel/rubygem-activesupport-gitlab && ${MAKE} makesum) (cd ../../www/rubygem-railties-gitlab && ${MAKE} makesum) (cd ../../databases/rubygem-globalid-rails-gitlab && ${MAKE} makesum) (cd ../../www/rubygem-responders-rails-gitlab && ${MAKE} makesum) .endif .include "${.CURDIR}/Makefile.common" .include diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index 6d44b00038e2..17873ac384d6 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,18 +1,18 @@ -GITLAB_VERSION= 18.4.3 -GITLAB_PORTREVISION= 2 +GITLAB_VERSION= 18.5.1 +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/} # Overwrite version for gitlab-kas-grpc GITLAB_KAS_GRPC_VERSION= ${GITLAB_VERSION} #GITLAB_KAS_GRPC_VERSION= 18.2.1 # Rails version RAILS_VERSION= 7.1.5.2 diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo index 89ed69ca076a..45bec2af3123 100644 --- a/www/gitlab/distinfo +++ b/www/gitlab/distinfo @@ -1,6 +1,6 @@ -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 +TIMESTAMP = 1761544051 +SHA256 (gitlab-foss-v18.5.1.tar.bz2) = 50f60927372f380930fc6a6b5b9bf3093c6b043ad488b8e5b941a8ca5bec5c91 +SIZE (gitlab-foss-v18.5.1.tar.bz2) = 122919401 +TIMESTAMP = 1761544091 +SHA256 (gitlab-v18.5.1-ee.tar.bz2) = e272ef2b363f2d5ba20b3a01eac3f17c07a193dbb453613d139a9400cb600e72 +SIZE (gitlab-v18.5.1-ee.tar.bz2) = 139335454 diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index c5e64b759360..d221500c3dda 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,201 +1,197 @@ ---- Gemfile.orig 2025-10-21 19:24:47 UTC +--- Gemfile.orig 2025-10-21 19:12:22 UTC +++ Gemfile -@@ -165,7 +165,7 @@ gem 'graphql', '2.5.11', feature_category: :api +@@ -166,7 +166,7 @@ gem 'graphql', '2.5.11', feature_category: :api # GraphQL API gem 'graphql', '2.5.11', 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 -@@ -295,7 +295,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature +@@ -296,7 +296,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature gem 'state_machines-activerecord', '~> 0.8.0', feature_category: :shared # Background jobs -gem 'sidekiq', path: 'vendor/gems/sidekiq', require: 'sidekiq', feature_category: :scalability +gem 'sidekiq', '>= 7.3.9', require: 'sidekiq', feature_category: :scalability gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', -@@ -473,141 +473,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared +@@ -474,141 +474,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 'lefthook', '~> 1.13.0', require: false, 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 - - gem 'letter_opener_web', '~> 3.0.0', feature_category: :shared - gem 'lookbook', '~> 2.3', feature_category: :shared - - # Better errors handler - gem 'better_errors', '~> 2.10.1', feature_category: :shared - - gem 'sprite-factory', '~> 1.7', feature_category: :shared - - gem 'listen', '~> 3.7', feature_category: :shared - -- gem 'ruby-lsp', "~> 0.23.0", require: false, feature_category: :tooling +- gem 'ruby-lsp', "~> 0.26.0", require: false, feature_category: :tooling - -- gem 'ruby-lsp-rails', "~> 0.3.6", feature_category: :tooling +- gem 'ruby-lsp-rails', "~> 0.4.8", feature_category: :tooling - -- gem 'ruby-lsp-rspec', "~> 0.1.10", require: false, feature_category: :tooling +- gem 'ruby-lsp-rspec', "~> 0.1.27", require: false, feature_category: :tooling - - gem 'gdk-toogle', '~> 0.9', '>= 0.9.5', require: 'toogle', feature_category: :tooling - - # 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 -end - -group :development, :test do - gem 'deprecation_toolkit', '~> 2.2.3', require: false, feature_category: :shared - gem 'bullet', '~> 8.0.0', feature_category: :shared - gem 'parser', '= 3.3.9.0', feature_category: :shared - gem 'pry-byebug', feature_category: :shared - gem 'pry-rails', '~> 0.3.9', feature_category: :shared - gem 'pry-shell', '~> 0.6.4', feature_category: :shared - -- gem 'awesome_print', require: false, feature_category: :shared +- gem 'amazing_print', require: false, feature_category: :shared - - gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database - gem 'rspec-rails', '~> 7.1.0', feature_category: :shared - gem 'factory_bot_rails', '~> 6.5.0', feature_category: :tooling - - # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) - gem 'minitest', '~> 5.11.0', feature_category: :shared - - gem 'spring', '~> 4.3.0', feature_category: :shared - gem 'spring-commands-rspec', '~> 1.0.4', feature_category: :shared - - gem 'gitlab-styles', '~> 13.1.0', feature_category: :tooling, require: false - gem 'haml_lint', '~> 0.58', feature_category: :tooling, require: false - - # Benchmarking & profiling - gem 'benchmark-ips', '~> 2.14.0', require: false, feature_category: :shared - gem 'benchmark-memory', '~> 0.1', require: false, feature_category: :shared - - 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 - - gem 'simple_po_parser', '~> 1.1.6', require: false, feature_category: :shared - - gem 'png_quantizator', '~> 0.2.1', require: false, feature_category: :shared - - gem 'parallel', '~> 1.19', require: false, feature_category: :shared - - gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup', feature_category: :shared - - gem 'pact', '~> 1.64', feature_category: :shared - - 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 - gem 'simplecov', '~> 0.22', require: false, feature_category: :tooling - gem 'simplecov-lcov', '~> 0.8.0', require: false, feature_category: :tooling - gem 'simplecov-cobertura', '~> 2.1.0', require: false, feature_category: :tooling - gem 'undercover', '~> 0.7.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 end -# Gems required in various pipelines -group :development, :test, :monorepo do - gem 'gitlab-rspec', path: 'gems/gitlab-rspec', feature_category: :shared - gem 'gitlab-rspec_flaky', path: 'gems/gitlab-rspec_flaky', feature_category: :tooling -end - -group :test do - gem 'rspec-retry', '~> 0.6.2', feature_category: :tooling - gem 'rspec_profiling', '~> 0.0.9', feature_category: :tooling - gem 'rspec-benchmark', '~> 0.6.0', feature_category: :tooling - gem 'rspec-parameterized', '~> 1.0', '>= 1.0.2', require: false, feature_category: :tooling - gem 'os', '~> 1.1', '>= 1.1.4', feature_category: :tooling - - gem 'capybara', '~> 3.40', feature_category: :test_platform - gem 'capybara-screenshot', '~> 1.0.26', feature_category: :test_platform - gem 'selenium-webdriver', '~> 4.21', '>= 4.21.1', feature_category: :test_platform - - gem 'graphlyte', '~> 1.0.0', feature_category: :shared - - # 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 - gem 'email_spec', '~> 2.3.0', feature_category: :shared - gem 'webmock', '~> 3.25.0', feature_category: :shared - gem 'rails-controller-testing', feature_category: :shared - gem 'concurrent-ruby', '~> 1.1', feature_category: :shared - gem 'test-prof', '~> 1.4.0', feature_category: :tooling - gem 'rspec_junit_formatter', feature_category: :shared - gem 'guard-rspec', feature_category: :shared - gem 'axe-core-rspec', '~> 4.10.0', feature_category: :tooling - gem 'state_machines-rspec', '~> 0.6', feature_category: :shared - - # 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.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 -@@ -641,10 +515,10 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside +@@ -642,7 +516,7 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat # Gitaly GRPC protocol definitions -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.3.0', feature_category: :deployment_management -+gem 'gitlab-kas-grpc', '~> 18.3', feature_category: :deployment_management - - gem 'grpc', '~> 1.74.0', feature_category: :shared - -@@ -667,7 +541,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: : + gem 'gitlab-kas-grpc', '~> 18.5.0-rc4', feature_category: :deployment_management +@@ -668,7 +542,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: : gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :shared # Countries list -gem 'countries', '~> 4.0.0', feature_category: :shared +gem 'countries', '~> 4.0', feature_category: :shared gem 'retriable', '~> 3.1.2', feature_category: :shared -@@ -752,10 +626,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc +@@ -753,10 +627,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc gem 'duo_api', '~> 1.3', feature_category: :system_access +gem 'parser' +gem 'net-smtp' +gem 'net-pop' +gem 'psych', '~> 3.1' + gem 'gitlab-sdk', '~> 0.3.0', feature_category: :application_instrumentation gem 'paper_trail', '~> 16.0', feature_category: :shared -gem "i18n_data", "~> 0.13.1", feature_category: :system_access +gem "i18n_data", "~> 0.13", feature_category: :system_access gem "gitlab-cloud-connector", "~> 1.26", require: 'gitlab/cloud_connector', feature_category: :plan_provisioning diff --git a/www/gitlab/files/patch-bin_background__jobs b/www/gitlab/files/patch-bin_background__jobs index 552f9367a5ce..532332130faa 100644 --- a/www/gitlab/files/patch-bin_background__jobs +++ b/www/gitlab/files/patch-bin_background__jobs @@ -1,11 +1,23 @@ ---- bin/background_jobs.orig 2021-12-01 10:42:56 UTC +--- bin/background_jobs.orig 2025-10-21 19:12:22 UTC +++ bin/background_jobs -@@ -58,7 +58,7 @@ start_sidekiq() +@@ -49,19 +49,14 @@ start_sidekiq() + start_sidekiq() + { + cmd="exec" +- chpst=$(command -v chpst) + +- if [ -n "$chpst" ]; then +- cmd="${cmd} ${chpst} -P" +- fi +- + # sidekiq-cluster expects an argument per process. + for (( i=1; i<=sidekiq_workers; i++ )) + do processes_args+=("${sidekiq_queues}") done -- ${cmd} bin/sidekiq-cluster "${processes_args[@]}" -P $sidekiq_pidfile -e $RAILS_ENV "$@" 2>&1 | tee -a $sidekiq_logfile -+ ${cmd} bin/sidekiq-cluster "${processes_args[@]}" -P $sidekiq_pidfile -e $RAILS_ENV "$@" 2>&1 >> $sidekiq_logfile +- ${cmd} bin/sidekiq-cluster "${processes_args[@]}" -P "$sidekiq_pidfile" -e "$RAILS_ENV" "$@" 2>&1 | tee -a "$sidekiq_logfile" ++ ${cmd} bin/sidekiq-cluster "${processes_args[@]}" -P "$sidekiq_pidfile" -e "$RAILS_ENV" "$@" 2>&1 >> "$sidekiq_logfile" } cleanup() diff --git a/www/gitlab/files/patch-vendor_gems_sidekiq_sidekiq.gemspec b/www/gitlab/files/patch-vendor_gems_sidekiq_sidekiq.gemspec new file mode 100644 index 000000000000..a66ec04e73f4 --- /dev/null +++ b/www/gitlab/files/patch-vendor_gems_sidekiq_sidekiq.gemspec @@ -0,0 +1,11 @@ +--- vendor/gems/sidekiq/sidekiq.gemspec.orig 2025-11-03 12:17:46 UTC ++++ vendor/gems/sidekiq/sidekiq.gemspec +@@ -8,7 +8,7 @@ Gem::Specification.new do |gem| + gem.homepage = "https://sidekiq.org" + gem.license = "LGPL-3.0" + +- gem.executables = ["sidekiq", "sidekiqmon"] ++ #gem.executables = ["sidekiq", "sidekiqmon"] + gem.files = %w[ + sidekiq.gemspec + README.md diff --git a/www/gitlab/pkg-message b/www/gitlab/pkg-message index 64b201d3412a..c11311173fd9 100644 --- a/www/gitlab/pkg-message +++ b/www/gitlab/pkg-message @@ -1,33 +1,33 @@ [ { message: <