git: 31f2eff37560 - main - www/gitlab: major update to 17.0.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 21 May 2024 08:25:28 UTC
The branch main has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=31f2eff375601bfe9cf31ce3887971650c6c7215
commit 31f2eff375601bfe9cf31ce3887971650c6c7215
Author: Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2024-05-20 08:51:24 +0000
Commit: Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2024-05-21 08:24:43 +0000
www/gitlab: major update to 17.0.0
Make sure you update to 16.11.x before!
Changes: https://about.gitlab.com/releases/2024/05/16/gitlab-17-0-released/
---
UPDATING | 10 ++++
devel/gitaly/Makefile | 5 +-
devel/gitaly/distinfo | 10 ++--
net/gitlab-agent/Makefile | 5 +-
net/gitlab-agent/distinfo | 10 ++--
www/gitlab-pages/Makefile | 3 +-
www/gitlab-pages/distinfo | 10 ++--
www/gitlab-workhorse/Makefile | 3 +-
www/gitlab-workhorse/distinfo | 10 ++--
www/gitlab/Makefile | 68 +++++++++++++++---------
www/gitlab/distinfo | 12 ++---
www/gitlab/files/patch-Gemfile | 59 +++++++++-----------
www/gitlab/files/patch-config_gitlab.yml.example | 14 ++---
www/gitlab/pkg-message | 4 +-
14 files changed, 118 insertions(+), 105 deletions(-)
diff --git a/UPDATING b/UPDATING
index 29ea88dabb24..c26e1f81b2cc 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,16 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20240521:
+ AFFECTS: www/gitlab
+ AUTHOR: mfechner@FreeBSD.org
+
+ Make sure you upgrade first to 16.11.x before you upgrade to the today
+ released version 17.0.0.
+
+ For more details see:
+ https://gitlab.fechner.net/mfechner/Gitlab-docu/-/blob/master/update/16.11-17.0-freebsd.md
+
20240517:
AFFECTS: comms/tio
AUTHOR: diizzy@FreeBSD.org
diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 4b13bb9088f5..30538402586e 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,7 +1,6 @@
PORTNAME= gitaly
DISTVERSIONPREFIX= v
-DISTVERSION= 16.11.2
-PORTREVISION= 1
+DISTVERSION= 17.0.0
CATEGORIES= devel
MAINTAINER= mfechner@FreeBSD.org
@@ -12,7 +11,7 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
# define dependencies that are required for build and run under MY_DEPENDS
-MY_DEPENDS= git>=2.43.0:devel/git
+MY_DEPENDS= git>=2.45.0:devel/git
BUILD_DEPENDS= bash>0:shells/bash \
${LOCALBASE}/bin/cmake:devel/cmake-core \
pcre2>0:devel/pcre2 \
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 055771afaa65..5d8fc543f87c 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1715233644
-SHA256 (go/devel_gitaly/gitaly-v16.11.2/go.mod) = 701cdacc7cfef68f40611c56a42b322cd4ddce5d2ad0508d51e43013adca7388
-SIZE (go/devel_gitaly/gitaly-v16.11.2/go.mod) = 11024
-SHA256 (go/devel_gitaly/gitaly-v16.11.2/gitaly-v16.11.2.tar.bz2) = 2ef5694964e536f9e484d821268579b96aabfd6fc412a1d8b968e85b560d3ab6
-SIZE (go/devel_gitaly/gitaly-v16.11.2/gitaly-v16.11.2.tar.bz2) = 2607224
+TIMESTAMP = 1716142318
+SHA256 (go/devel_gitaly/gitaly-v17.0.0/go.mod) = b3bc1c564079168d4d922a5dbde5fc43db3775820f008dd0266a6f5f10644015
+SIZE (go/devel_gitaly/gitaly-v17.0.0/go.mod) = 10988
+SHA256 (go/devel_gitaly/gitaly-v17.0.0/gitaly-v17.0.0.tar.bz2) = ddd63393291a923103db8c83a0e5165ae651cd1e9494d72e354ce1c1ccfc1e0d
+SIZE (go/devel_gitaly/gitaly-v17.0.0/gitaly-v17.0.0.tar.bz2) = 2613764
diff --git a/net/gitlab-agent/Makefile b/net/gitlab-agent/Makefile
index 4259634dbe4f..f3fe07c48491 100644
--- a/net/gitlab-agent/Makefile
+++ b/net/gitlab-agent/Makefile
@@ -1,7 +1,6 @@
PORTNAME= gitlab-agent
-PORTVERSION= 16.11.2
+PORTVERSION= 17.0.0
DISTVERSIONPREFIX= v
-PORTREVISION= 1
CATEGORIES= net
MAINTAINER= mfechner@FreeBSD.org
@@ -15,7 +14,7 @@ BUILD_DEPENDS= git>=0:devel/git \
golangci-lint>=0:devel/golangci-lint
USES= go:modules,1.22
-GO_MODULE= gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v16
+GO_MODULE= gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v17
_BUILD_DATE= $$(date -u "+%Y-%m-%d-%H%M UTC")
GO_TARGET= ./cmd/kas
diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo
index f12a8c844aba..34cbef573ea5 100644
--- a/net/gitlab-agent/distinfo
+++ b/net/gitlab-agent/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1715233688
-SHA256 (go/net_gitlab-agent/gitlab-agent-v16.11.2/v16.11.2.mod) = 73740cc2454413865622b26264c35ee5cdd7dd701e66e9e9642dc7d30e690b56
-SIZE (go/net_gitlab-agent/gitlab-agent-v16.11.2/v16.11.2.mod) = 7055
-SHA256 (go/net_gitlab-agent/gitlab-agent-v16.11.2/v16.11.2.zip) = 102901d9e5671fb6d2486fbdbde3a6296081727602204615f2d6e123f2a074cc
-SIZE (go/net_gitlab-agent/gitlab-agent-v16.11.2/v16.11.2.zip) = 1256580
+TIMESTAMP = 1716193014
+SHA256 (go/net_gitlab-agent/gitlab-agent-v17.0.0/v17.0.0.mod) = d8774eb02565f5c192d37fbc7caacd3d27dbcabcbebecd5b4afcb5b32d3e0776
+SIZE (go/net_gitlab-agent/gitlab-agent-v17.0.0/v17.0.0.mod) = 7042
+SHA256 (go/net_gitlab-agent/gitlab-agent-v17.0.0/v17.0.0.zip) = 0e0ac371f0cf357028e33b1f8d1f190d69ee391a56420c84164386b8e64dd51f
+SIZE (go/net_gitlab-agent/gitlab-agent-v17.0.0/v17.0.0.zip) = 1210254
diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile
index 03ce9a176363..a18542f43cfa 100644
--- a/www/gitlab-pages/Makefile
+++ b/www/gitlab-pages/Makefile
@@ -1,7 +1,6 @@
PORTNAME= gitlab-pages
-PORTVERSION= 16.11.2
+PORTVERSION= 17.0.0
DISTVERSIONPREFIX= v
-PORTREVISION= 1
CATEGORIES= www
MASTER_SITES+= https://gitlab.com/gitlab-org/gitlab-pages/-/raw/v${DISTVERSION}/
DISTFILES+= go.mod
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
index a0a26ee3eb8a..372f6cb8936a 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1715233578
-SHA256 (go/www_gitlab-pages/gitlab-pages-v16.11.2/go.mod) = de0926d06d56e5cdb84c2c4fd4bc05bb9c8c3724a8e1cf8c0f775856958540ba
-SIZE (go/www_gitlab-pages/gitlab-pages-v16.11.2/go.mod) = 3328
-SHA256 (go/www_gitlab-pages/gitlab-pages-v16.11.2/gitlab-pages-v16.11.2.tar.bz2) = b3e20a66f98fe1b18f455f24434078cb9cde069040ca3ad49a92acc9abae2553
-SIZE (go/www_gitlab-pages/gitlab-pages-v16.11.2/gitlab-pages-v16.11.2.tar.bz2) = 212649
+TIMESTAMP = 1716142216
+SHA256 (go/www_gitlab-pages/gitlab-pages-v17.0.0/go.mod) = de0926d06d56e5cdb84c2c4fd4bc05bb9c8c3724a8e1cf8c0f775856958540ba
+SIZE (go/www_gitlab-pages/gitlab-pages-v17.0.0/go.mod) = 3328
+SHA256 (go/www_gitlab-pages/gitlab-pages-v17.0.0/gitlab-pages-v17.0.0.tar.bz2) = cc73f2d8055c117bce32a7e4927e9f24b400e75949351764438dbd394e5929d8
+SIZE (go/www_gitlab-pages/gitlab-pages-v17.0.0/gitlab-pages-v17.0.0.tar.bz2) = 212538
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index 05e711f7afc4..9367d2cdedc0 100644
--- a/www/gitlab-workhorse/Makefile
+++ b/www/gitlab-workhorse/Makefile
@@ -1,7 +1,6 @@
PORTNAME= gitlab-workhorse
-PORTVERSION= 16.11.2
+PORTVERSION= 17.0.0
DISTVERSIONPREFIX= v
-PORTREVISION= 1
CATEGORIES= www
MAINTAINER= mfechner@FreeBSD.org
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index 68c3f2fa644c..035ced8802a7 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1715233555
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.11.2/go.mod) = 2c1ff4ba288aa4bf72cc93438b6dda7660257f50eeb7823f9acc0dde5412c499
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.11.2/go.mod) = 7010
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.11.2/gitlab-foss-v16.11.2.tar.bz2) = df51a6799690bdaf09091009993afdccd9fbff07387431ec591217de30e57a72
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.11.2/gitlab-foss-v16.11.2.tar.bz2) = 102643047
+TIMESTAMP = 1716138943
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.0.0/go.mod) = 01accf76d651c177faba180d5d544c1509d3af644af5acb5a7c40268b744f99e
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.0.0/go.mod) = 7030
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.0.0/gitlab-foss-v17.0.0.tar.bz2) = b4c809cf09846f3dff3c55cba6a6e6a7d16c0e790b2f2c86bf3cf89a67b7bd9f
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.0.0/gitlab-foss-v17.0.0.tar.bz2) = 103670734
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index e1734b735af5..f15aacf1d9bb 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -1,7 +1,6 @@
PORTNAME= gitlab-${FLAVOR:Uce}
-PORTVERSION= 16.11.2
+PORTVERSION= 17.0.0
DISTVERSIONPREFIX= v
-PORTREVISION= 1
.if ${FLAVOR:U} == ee
DISTVERSIONSUFFIX= -ee
.endif
@@ -47,7 +46,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-ipaddr>=1.2.5<1.3:net/rubygem-ipaddr \
rubygem-responders-rails70>=3.0<4.0:www/rubygem-responders-rails70 \
rubygem-sprockets3>=3.7<3.8:devel/rubygem-sprockets3 \
- rubygem-view_component-rails70>=3.11.0<3.12:devel/rubygem-view_component-rails70 \
+ rubygem-view_component-rails70>=3.12.1<3.13:devel/rubygem-view_component-rails70 \
rubygem-pg>=1.5.6<1.6:databases/rubygem-pg \
rubygem-neighbor>=0.2.3<0.3:databases/rubygem-neighbor \
rubygem-rugged>=1.6<2:devel/rubygem-rugged \
@@ -63,15 +62,12 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-omniauth>=2.1.0<3:security/rubygem-omniauth \
rubygem-omniauth-auth0>=3.1.0<3.2.0:net/rubygem-omniauth-auth0 \
rubygem-omniauth-azure-activedirectory-v2>=2.0<3:net/rubygem-omniauth-azure-activedirectory-v2 \
- rubygem-omniauth-dingtalk-oauth2>=1.0.1<2:security/rubygem-omniauth-dingtalk-oauth2 \
rubygem-omniauth-alicloud>=3.0.0<3.1:security/rubygem-omniauth-alicloud \
- rubygem-omniauth-facebook>=4.0.0:net/rubygem-omniauth-facebook \
rubygem-omniauth-github>=2.0.1<2.1:net/rubygem-omniauth-github \
rubygem-omniauth-google-oauth2>=1.1<2:net/rubygem-omniauth-google-oauth2 \
rubygem-omniauth-oauth2-generic>=0.2.2<0.3.0:security/rubygem-omniauth-oauth2-generic \
rubygem-omniauth-saml>=2.1.0<3:security/rubygem-omniauth-saml \
rubygem-omniauth-shibboleth-redux>=2.0<3:security/rubygem-omniauth-shibboleth-redux \
- rubygem-omniauth-twitter>=1.4<2.0:net/rubygem-omniauth-twitter \
rubygem-omniauth_openid_connect>=0.6.1<0.7.0:net/rubygem-omniauth_openid_connect \
rubygem-openid_connect>=1.3.1<1.3.2:net/rubygem-openid_connect \
rubygem-omniauth-atlassian-oauth2>=0.2.0<0.3:security/rubygem-omniauth-atlassian-oauth2 \
@@ -92,12 +88,12 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-gitlab_omniauth-ldap>=2.2.0<2.3.0:net/rubygem-gitlab_omniauth-ldap \
rubygem-net-ldap017>=0.17.1<0.18:net/rubygem-net-ldap017 \
rubygem-grape>=2.0.0<2.1:devel/rubygem-grape \
- rubygem-grape-entity>=0.10.2<0.11.0,1:devel/rubygem-grape-entity \
+ rubygem-grape-entity>=1.0.1<1.1,1:devel/rubygem-grape-entity \
rubygem-grape-swagger20>=2.0.2<2.1:devel/rubygem-grape-swagger20 \
rubygem-grape-swagger-entity>=0.5.1<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.2.5<2.3:devel/rubygem-graphql \
+ rubygem-graphql>=2.3.2<2.4:devel/rubygem-graphql \
rubygem-graphql-docs>=4.0.0<4.1.0:devel/rubygem-graphql-docs \
rubygem-graphiql-rails>=1.8.0<1.9:devel/rubygem-graphiql-rails \
rubygem-apollo_upload_server>=2.1.5<2.2:net/rubygem-apollo_upload_server \
@@ -110,7 +106,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-mini_magick>=4.12<5:graphics/rubygem-mini_magick \
rubygem-fog-aws>=3.18<4:net/rubygem-fog-aws \
rubygem-fog-core210>=2.1.0<2.1.1:devel/rubygem-fog-core210 \
- rubygem-fog-google>=1.19<2:net/rubygem-fog-google \
+ rubygem-fog-google>=1.24.1<1.25:net/rubygem-fog-google \
rubygem-fog-local>=0.8<1.0:net/rubygem-fog-local \
rubygem-fog-aliyun>=0.4<1.0:net/rubygem-fog-aliyun \
rubygem-gitlab-fog-azure-rm>=1.9.1<1.10:net/rubygem-gitlab-fog-azure-rm \
@@ -133,9 +129,9 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-elasticsearch-model713>=7.2<8:textproc/rubygem-elasticsearch-model713 \
rubygem-elasticsearch-rails>=7.2<8:textproc/rubygem-elasticsearch-rails \
rubygem-elasticsearch-api713>=7.13.3<7.13.4:textproc/rubygem-elasticsearch-api713 \
- rubygem-aws-sdk-core>=3.191.6<4:devel/rubygem-aws-sdk-core \
+ rubygem-aws-sdk-core>=3.194.2<4:devel/rubygem-aws-sdk-core \
rubygem-aws-sdk-cloudformation>=1<2:devel/rubygem-aws-sdk-cloudformation \
- rubygem-aws-sdk-s3>=1.146.1<2:devel/rubygem-aws-sdk-s3 \
+ rubygem-aws-sdk-s3>=1.149.1<2:devel/rubygem-aws-sdk-s3 \
rubygem-faraday_middleware-aws-sigv403>=0.3.0<0.4:devel/rubygem-faraday_middleware-aws-sigv403 \
rubygem-typhoeus>=1.4.0<1.5:www/rubygem-typhoeus \
rubygem-html-pipeline>=2.14.3<2.15:textproc/rubygem-html-pipeline \
@@ -154,7 +150,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-rouge>=4.2.0<4.3:textproc/rubygem-rouge \
rubygem-truncato>=0.7.12<0.8.0:textproc/rubygem-truncato \
rubygem-nokogiri>=1.16<2:textproc/rubygem-nokogiri \
- rubygem-gitlab-glfm-markdown>=0.0.14<0.1:textproc/rubygem-gitlab-glfm-markdown \
+ rubygem-gitlab-glfm-markdown>=0.0.16<0.1:textproc/rubygem-gitlab-glfm-markdown \
rubygem-icalendar>=0:devel/rubygem-icalendar \
rubygem-diffy>=3.4<4:textproc/rubygem-diffy \
rubygem-rack22>=2.2.8.1,3<2.3,3:www/rubygem-rack22 \
@@ -174,9 +170,9 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-version_sorter>=2.3<3:textproc/rubygem-version_sorter \
rubygem-js_regex>=3.8<4.0:textproc/rubygem-js_regex \
rubygem-device_detector>=0:devel/rubygem-device_detector \
- rubygem-redis-namespace110>=1.10.0<1.11:databases/rubygem-redis-namespace110 \
- rubygem-redis50>=5.0.0<5.1:databases/rubygem-redis50 \
- rubygem-redis-clustering50>=5.0.0<5.1:databases/rubygem-redis-clustering50 \
+ rubygem-redis-namespace>=1.11.0<1.12:databases/rubygem-redis-namespace \
+ rubygem-redis>=5.2.0<5.3:databases/rubygem-redis \
+ rubygem-redis-clustering>=5.2.0<5.3:databases/rubygem-redis-clustering \
rubygem-connection_pool>=2.4.1<3.0:net/rubygem-connection_pool \
rubygem-redis-actionpack-rails70>=5.4.0<5.5:databases/rubygem-redis-actionpack-rails70 \
rubygem-discordrb-webhooks>=3.5<4.0:net-im/rubygem-discordrb-webhooks \
@@ -206,22 +202,44 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-base32>=0.3.0<0.4.0:converters/rubygem-base32 \
rubygem-gitlab-license>=2.4<3:devel/rubygem-gitlab-license \
rubygem-rack-attack>=6.7.0<6.8:www/rubygem-rack-attack \
- rubygem-sentry-raven>=3.1<4.0:devel/rubygem-sentry-raven \
- rubygem-sentry-ruby>=5.10.0<5.11:devel/rubygem-sentry-ruby \
- rubygem-sentry-rails>=5.10.0<5.11:devel/rubygem-sentry-rails \
- rubygem-sentry-sidekiq>=5.10.0<5.11:devel/rubygem-sentry-sidekiq \
+ rubygem-sentry-ruby>=5.17.3<5.18:devel/rubygem-sentry-ruby \
+ rubygem-sentry-rails>=5.17.3<5.18:devel/rubygem-sentry-rails \
+ rubygem-sentry-sidekiq>=5.17.3<5.18:devel/rubygem-sentry-sidekiq \
rubygem-pg_query>=5.1.0<5.2:databases/rubygem-pg_query \
rubygem-premailer-rails110-rails70>=1.10.3<1.11:mail/rubygem-premailer-rails110-rails70 \
- rubygem-gitlab-labkit>=0.35.1<0.36:devel/rubygem-gitlab-labkit \
+ rubygem-gitlab-labkit>=0.36.0<0.37:devel/rubygem-gitlab-labkit \
rubygem-thrift>=0.16.0:devel/rubygem-thrift \
- rubygem-rails-i18n-rails70>=7.0<8:devel/rubygem-rails-i18n-rails70 \
+ rubygem-rails-i18n-rails70>=7.0.9<8:devel/rubygem-rails-i18n-rails70 \
rubygem-gettext_i18n_rails>=1.12.0<1.13:devel/rubygem-gettext_i18n_rails \
rubygem-gettext>=3.4<4:devel/rubygem-gettext \
- rubygem-batch-loader>=2.0.1<2.1:devel/rubygem-batch-loader \
+ rubygem-batch-loader>=2.0.5<2.1:devel/rubygem-batch-loader \
rubygem-peek-rails70>=1.1<2.0:devel/rubygem-peek-rails70 \
rubygem-snowplow-tracker>=0.8.0<1:devel/rubygem-snowplow-tracker \
rubygem-webrick>=1.8.1<1.9:www/rubygem-webrick \
rubygem-prometheus-client-mmap>=1.1.1<2:devel/rubygem-prometheus-client-mmap \
+ rubygem-opentelemetry-sdk>=1.4.0:devel/rubygem-opentelemetry-sdk \
+ rubygem-opentelemetry-exporter-otlp>=0.26.3:devel/rubygem-opentelemetry-exporter-otlp \
+ rubygem-opentelemetry-instrumentation-active_support>=0.5.1:devel/rubygem-opentelemetry-instrumentation-active_support \
+ rubygem-opentelemetry-instrumentation-action_pack>=0.9.0:devel/rubygem-opentelemetry-instrumentation-action_pack \
+ rubygem-opentelemetry-instrumentation-active_job>=0.7.1:devel/rubygem-opentelemetry-instrumentation-active_job \
+ rubygem-opentelemetry-instrumentation-active_record>=0.7.0:devel/rubygem-opentelemetry-instrumentation-active_record \
+ rubygem-opentelemetry-instrumentation-action_view>=0.7.0:devel/rubygem-opentelemetry-instrumentation-action_view \
+ rubygem-opentelemetry-instrumentation-aws_sdk>=0.5.1:devel/rubygem-opentelemetry-instrumentation-aws_sdk \
+ rubygem-opentelemetry-instrumentation-http>=0.23.2:devel/rubygem-opentelemetry-instrumentation-http \
+ rubygem-opentelemetry-instrumentation-concurrent_ruby>=0.21.2:devel/rubygem-opentelemetry-instrumentation-concurrent_ruby \
+ rubygem-opentelemetry-instrumentation-ethon>=0.21.3:devel/rubygem-opentelemetry-instrumentation-ethon \
+ rubygem-opentelemetry-instrumentation-excon>=0.22.0:devel/rubygem-opentelemetry-instrumentation-excon \
+ rubygem-opentelemetry-instrumentation-faraday>=0.24.0:devel/rubygem-opentelemetry-instrumentation-faraday \
+ rubygem-opentelemetry-instrumentation-grape>=0.1.6:devel/rubygem-opentelemetry-instrumentation-grape \
+ rubygem-opentelemetry-instrumentation-graphql>=0.28.0:devel/rubygem-opentelemetry-instrumentation-graphql \
+ rubygem-opentelemetry-instrumentation-http_client>=0.22.3:devel/rubygem-opentelemetry-instrumentation-http_client \
+ rubygem-opentelemetry-instrumentation-net_http>=0.22.4:devel/rubygem-opentelemetry-instrumentation-net_http \
+ rubygem-opentelemetry-instrumentation-pg>=0.27.1:devel/rubygem-opentelemetry-instrumentation-pg \
+ rubygem-opentelemetry-instrumentation-rack>=0.24.0:devel/rubygem-opentelemetry-instrumentation-rack \
+ rubygem-opentelemetry-instrumentation-rails>=0.30.0:devel/rubygem-opentelemetry-instrumentation-rails \
+ rubygem-opentelemetry-instrumentation-rake>=0.2.1:devel/rubygem-opentelemetry-instrumentation-rake \
+ rubygem-opentelemetry-instrumentation-redis>=0.25.3:devel/rubygem-opentelemetry-instrumentation-redis \
+ rubygem-opentelemetry-instrumentation-sidekiq>=0.25.2:devel/rubygem-opentelemetry-instrumentation-sidekiq \
rubygem-warning>=1.3.0<1.4:devel/rubygem-warning \
rubygem-gitlab-dangerfiles>=4.7.0<4.8:devel/rubygem-gitlab-dangerfiles \
rubygem-license_finder>=7.0.0<8:devel/rubygem-license_finder \
@@ -241,9 +259,9 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-net-ntp>0:net/rubygem-net-ntp \
rubygem-ssh_data>=1.3<2:security/rubygem-ssh_data \
rubygem-spamcheck>=1.3.0<1.4:net/rubygem-spamcheck \
- rubygem-gitaly>=16.11.0.pre.rc1<16.12.0:net/rubygem-gitaly \
- rubygem-kas-grpc>=0.4.0,1<0.5.0,1:net/rubygem-kas-grpc \
- rubygem-grpc>=1.60.0<2:net/rubygem-grpc \
+ rubygem-gitaly>=17.0.0.pre.rc2<17.1:net/rubygem-gitaly \
+ rubygem-kas-grpc>=0.5.0,1<0.6.0,1:net/rubygem-kas-grpc \
+ rubygem-grpc>=1.63.0<2:net/rubygem-grpc \
rubygem-google-protobuf>=3.25.3<4:devel/rubygem-google-protobuf \
rubygem-toml-rb>=2.2.0<3:www/rubygem-toml-rb \
rubygem-flipper026>=0.26.2<0.27:devel/rubygem-flipper026 \
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index 3f141a251508..e793c208bcd9 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1715233601
-SHA256 (gitlab-foss-v16.11.2.tar.bz2) = df51a6799690bdaf09091009993afdccd9fbff07387431ec591217de30e57a72
-SIZE (gitlab-foss-v16.11.2.tar.bz2) = 102643047
-TIMESTAMP = 1715233651
-SHA256 (gitlab-v16.11.2-ee.tar.bz2) = f0a5872ea2057fcaa204e78cf493b5cf259b8112471924ebb09d201701656035
-SIZE (gitlab-v16.11.2-ee.tar.bz2) = 110321273
+TIMESTAMP = 1716193221
+SHA256 (gitlab-foss-v17.0.0.tar.bz2) = b4c809cf09846f3dff3c55cba6a6e6a7d16c0e790b2f2c86bf3cf89a67b7bd9f
+SIZE (gitlab-foss-v17.0.0.tar.bz2) = 103670734
+TIMESTAMP = 1716193336
+SHA256 (gitlab-v17.0.0-ee.tar.bz2) = a83518a3edc711a91b9941f96365b2f869d8db411db4ee5bd5b1f27f42555672
+SIZE (gitlab-v17.0.0-ee.tar.bz2) = 111194012
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index 19e303a3e6a7..cb36ba55d06e 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig 2024-04-17 11:47:15 UTC
+--- Gemfile.orig 2024-05-15 08:00:50 UTC
+++ Gemfile
@@ -58,7 +58,7 @@ gem 'rugged', '~> 1.6' # rubocop:todo Gemfile/MissingF
@@ -9,18 +9,16 @@
gem 'marginalia', '~> 1.11.1' # rubocop:todo Gemfile/MissingFeatureCategory
# Authorization
-@@ -78,8 +78,8 @@ gem 'omniauth-alicloud', '~> 3.0.0' # rubocop:todo Gem
- gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md # rubocop:todo Gemfile/MissingFeatureCategory
- gem 'omniauth-dingtalk-oauth2', '~> 1.0' # rubocop:todo Gemfile/MissingFeatureCategory
+@@ -76,7 +76,7 @@ gem 'omniauth-alicloud', '~> 3.0.0' # rubocop:todo Gem
+ gem 'omniauth-auth0', '~> 3.1' # rubocop:todo Gemfile/MissingFeatureCategory
+ gem 'omniauth-azure-activedirectory-v2', '~> 2.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'omniauth-alicloud', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
--gem 'omniauth-facebook', '~> 4.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'omniauth-github', '2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory
-+gem 'omniauth-facebook', '>= 4.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'omniauth-github', '~> 2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md # rubocop:todo Gemfile/MissingFeatureCategory
gem 'omniauth-google-oauth2', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'omniauth-oauth2-generic', '~> 0.2.2' # rubocop:todo Gemfile/MissingFeatureCategory
-@@ -90,7 +90,7 @@ gem 'omniauth_openid_connect', '~> 0.6.1' # rubocop:to
+@@ -86,7 +86,7 @@ gem 'omniauth_openid_connect', '~> 0.6.1' # rubocop:to
gem 'omniauth_openid_connect', '~> 0.6.1' # rubocop:todo Gemfile/MissingFeatureCategory
# Locked until Ruby 3.0 upgrade since upgrading will pull in an updated net-smtp gem.
# See https://docs.gitlab.com/ee/development/emails.html#rationale.
@@ -29,7 +27,7 @@
gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md # rubocop:todo Gemfile/MissingFeatureCategory
gem 'omniauth-atlassian-oauth2', '~> 0.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'rack-oauth2', '~> 1.21.3' # rubocop:todo Gemfile/MissingFeatureCategory
-@@ -185,7 +185,7 @@ gem 'google-cloud-storage', '~> 1.45.0' # rubocop:todo
+@@ -181,7 +181,7 @@ gem 'google-cloud-storage', '~> 1.45.0' # rubocop:todo
gem 'google-apis-storage_v1', '~> 0.29' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'google-cloud-storage', '~> 1.45.0' # rubocop:todo Gemfile/MissingFeatureCategory
# We need >= 0.11.1 because that's when match_glob support is added to list_objects
@@ -38,7 +36,7 @@
gem 'google-apis-compute_v1', '~> 0.57.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'google-apis-container_v1', '~> 0.43.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'google-apis-container_v1beta1', '~> 0.43.0' # rubocop:todo Gemfile/MissingFeatureCategory
-@@ -196,7 +196,7 @@ gem 'google-apis-androidpublisher_v3', '~> 0.34.0' # r
+@@ -192,7 +192,7 @@ gem 'google-apis-androidpublisher_v3', '~> 0.34.0' # r
gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'google-apis-androidpublisher_v3', '~> 0.34.0' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -47,19 +45,19 @@
gem 'google-cloud-artifact_registry-v1', '~> 0.11.0', feature_category: :shared
gem 'google-cloud-compute-v1', '~> 2.6.0', feature_category: :shared
-@@ -207,9 +207,9 @@ gem 'elasticsearch-api', '7.13.3' # rubocop:todo Gem
+@@ -203,9 +203,9 @@ gem 'elasticsearch-api', '7.13.3' # rubocop:todo Gem
gem 'elasticsearch-model', '~> 7.2' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'elasticsearch-api', '7.13.3' # rubocop:todo Gemfile/MissingFeatureCategory
--gem 'aws-sdk-core', '~> 3.191.6' # rubocop:todo Gemfile/MissingFeatureCategory
-+gem 'aws-sdk-core', '~> 3.191' # rubocop:todo Gemfile/MissingFeatureCategory
+-gem 'aws-sdk-core', '~> 3.194.2' # rubocop:todo Gemfile/MissingFeatureCategory
++gem 'aws-sdk-core', '~> 3.194' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory
--gem 'aws-sdk-s3', '~> 1.146.1' # rubocop:todo Gemfile/MissingFeatureCategory
-+gem 'aws-sdk-s3', '~> 1.146' # rubocop:todo Gemfile/MissingFeatureCategory
+-gem 'aws-sdk-s3', '~> 1.149.1' # rubocop:todo Gemfile/MissingFeatureCategory
++gem 'aws-sdk-s3', '~> 1.149' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # rubocop:todo Gemfile/MissingFeatureCategory
-@@ -240,12 +240,12 @@ gem 'diff_match_patch', '~> 0.1.0', path: 'vendor/gems
+@@ -236,12 +236,12 @@ gem 'diff_match_patch', '~> 0.1.0', path: 'vendor/gems
gem 'diff_match_patch', '~> 0.1.0', path: 'vendor/gems/diff_match_patch', feature_category: :team_planning
# Application server
@@ -74,7 +72,7 @@
gem 'sd_notify', '~> 0.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
end
-@@ -256,7 +256,7 @@ gem 'acts-as-taggable-on', '~> 10.0' # rubocop:todo Ge
+@@ -252,7 +252,7 @@ gem 'acts-as-taggable-on', '~> 10.0' # rubocop:todo Ge
gem 'acts-as-taggable-on', '~> 10.0' # rubocop:todo Gemfile/MissingFeatureCategory
# Background jobs
@@ -83,7 +81,7 @@
gem 'sidekiq-cron', '~> 1.12.0', feature_category: :shared
gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', require: 'sidekiq-reliable-fetch' # rubocop:todo Gemfile/MissingFeatureCategory
-@@ -401,95 +401,10 @@ gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/Missi
+@@ -425,95 +425,10 @@ gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/Missi
gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -93,7 +91,7 @@
- gem 'solargraph', '~> 0.47.2', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-
- gem 'letter_opener_web', '~> 2.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
-- gem 'lookbook', '~> 2.2', '>= 2.2.2' # rubocop:todo Gemfile/MissingFeatureCategory
+- gem 'lookbook', '~> 2.3' # rubocop:todo Gemfile/MissingFeatureCategory
-
- # Better errors handler
- gem 'better_errors', '~> 2.10.1' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -102,7 +100,7 @@
-
- gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory
-
-- gem 'ruby-lsp', "~> 0.14.6", require: false, feature_category: :tooling
+- gem 'ruby-lsp', "~> 0.16.6", require: false, feature_category: :tooling
-
- gem 'ruby-lsp-rails', "~> 0.3.3", feature_category: :tooling
-
@@ -132,7 +130,7 @@
- gem 'spring-commands-rspec', '~> 1.0.4' # rubocop:todo Gemfile/MissingFeatureCategory
-
- gem 'gitlab-styles', '~> 11.0.0', feature_category: :tooling
-- gem 'haml_lint', '~> 0.53', feature_category: :tooling
+- gem 'haml_lint', '~> 0.57', feature_category: :tooling
-
- gem 'bundler-audit', '~> 0.9.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-
@@ -179,7 +177,7 @@
# Gems required in omnibus-gitlab pipeline
group :development, :test, :omnibus do
gem 'license_finder', '~> 7.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-@@ -501,36 +416,6 @@ end
+@@ -525,36 +440,6 @@ end
gem 'gitlab-rspec_flaky', path: 'gems/gitlab-rspec_flaky', feature_category: :tooling
end
@@ -202,7 +200,7 @@
- gem 'webmock', '~> 3.23.0', feature_category: :shared
- gem 'rails-controller-testing' # rubocop:todo Gemfile/MissingFeatureCategory
- gem 'concurrent-ruby', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory
-- gem 'test-prof', '~> 1.3.2', feature_category: :tooling
+- gem 'test-prof', '~> 1.3.3', feature_category: :tooling
- gem 'rspec_junit_formatter' # rubocop:todo Gemfile/MissingFeatureCategory
- gem 'guard-rspec' # rubocop:todo Gemfile/MissingFeatureCategory
- gem 'axe-core-rspec', '~> 4.9.0', feature_category: :tooling
@@ -210,22 +208,13 @@
- # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
- gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-
-- gem 'gitlab_quality-test_tooling', '~> 1.21.1', require: false, feature_category: :tooling
+- gem 'gitlab_quality-test_tooling', '~> 1.24.0', require: false, feature_category: :tooling
-end
-
gem 'octokit', '~> 8.1', feature_category: :importers
gem 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :shared
-@@ -568,7 +453,7 @@ gem 'kas-grpc', '~> 0.4.0', feature_category: :deploym
- # KAS GRPC protocol definitions
- gem 'kas-grpc', '~> 0.4.0', feature_category: :deployment_management
-
--gem 'grpc', '~> 1.60.0' # rubocop:todo Gemfile/MissingFeatureCategory
-+gem 'grpc', '~> 1.60' # rubocop:todo Gemfile/MissingFeatureCategory
-
- gem 'google-protobuf', '~> 3.25', '>= 3.25.3' # rubocop:todo Gemfile/MissingFeatureCategory
-
-@@ -589,7 +474,7 @@ gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfil
+@@ -613,7 +498,7 @@ gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfil
gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfile/MissingFeatureCategory
# Countries list
@@ -234,7 +223,7 @@
gem 'retriable', '~> 3.1.2' # rubocop:todo Gemfile/MissingFeatureCategory
-@@ -655,6 +540,7 @@ gem 'telesignenterprise', '~> 2.2' # rubocop:todo Gemf
+@@ -679,6 +564,7 @@ gem 'telesignenterprise', '~> 2.2' # rubocop:todo Gemf
gem 'telesignenterprise', '~> 2.2' # rubocop:todo Gemfile/MissingFeatureCategory
# BufferedIO patch
@@ -242,7 +231,7 @@
# Updating this version will require updating scripts/allowed_warnings.txt
gem 'net-protocol', '~> 0.1.3' # rubocop:todo Gemfile/MissingFeatureCategory
# Lock this until we make DNS rebinding work with the updated net-http:
-@@ -662,5 +548,11 @@ gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/Missing
+@@ -686,5 +572,11 @@ gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/Missing
gem 'net-http', '= 0.1.1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory
diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example
index 45a8c89d5209..15a9fb52c93c 100644
--- a/www/gitlab/files/patch-config_gitlab.yml.example
+++ b/www/gitlab/files/patch-config_gitlab.yml.example
@@ -1,4 +1,4 @@
---- config/gitlab.yml.example.orig 2024-04-17 11:47:15 UTC
+--- config/gitlab.yml.example.orig 2024-05-15 08:00:50 UTC
+++ config/gitlab.yml.example
@@ -463,7 +463,7 @@ production: &base
## GitLab Pages
@@ -22,7 +22,7 @@
# File that contains the shared secret key for verifying access for gitlab-pages.
# Default is '.gitlab_pages_secret' relative to Rails.root (i.e. root of the GitLab app).
-@@ -1209,13 +1209,13 @@ production: &base
+@@ -1200,13 +1200,13 @@ production: &base
repositories:
storages: # You must have at least a `default` storage path.
default:
@@ -38,7 +38,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
-@@ -1250,12 +1250,12 @@ production: &base
+@@ -1241,12 +1241,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@@ -54,7 +54,7 @@
# Git over HTTP
upload_pack: true
-@@ -1270,13 +1270,13 @@ production: &base
+@@ -1261,13 +1261,13 @@ 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).
@@ -70,7 +70,7 @@
# The URL to the external KAS API (used by the Kubernetes agents)
# external_url: wss://kas.example.com
-@@ -1300,13 +1300,13 @@ production: &base
+@@ -1291,13 +1291,13 @@ production: &base
## GitLab Elasticsearch settings
elasticsearch:
@@ -86,7 +86,7 @@
## Webpack settings
# If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
-@@ -1327,18 +1327,18 @@ production: &base
+@@ -1318,18 +1318,18 @@ production: &base
# Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq.
sidekiq_exporter:
@@ -112,7 +112,7 @@
# Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma.
web_exporter:
-@@ -1565,13 +1565,13 @@ test:
+@@ -1556,13 +1556,13 @@ test:
gitaly_address: unix:tmp/tests/gitaly/praefect.socket
gitaly:
diff --git a/www/gitlab/pkg-message b/www/gitlab/pkg-message
index 039c61ef5679..edbd599c11e6 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.fechner.net/mfechner/Gitlab-docu/blob/master/install/16.10-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/17.0-freebsd.md
EOM
type: install
}
@@ -20,7 +20,7 @@ EOM
If you just installed an major upgrade of GitLab, for example you
switched from 14.5.x to 14.6.x, please follow the instructions in the guide at:
-https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/16.10-16.11-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/16.11-17.0-freebsd.md
If you just installed an minor upgrade of GitLab please follow
the instructions in the guide at: