git: 376e314a04ec - 2024Q1 - www/gitlab-ce: major upgrade to 16.7.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 15 Jan 2024 12:09:25 UTC
The branch 2024Q1 has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=376e314a04ec8766a333cf08ac4b7b6200154c82
commit 376e314a04ec8766a333cf08ac4b7b6200154c82
Author: Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2024-01-03 12:03:42 +0000
Commit: Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2024-01-15 12:07:01 +0000
www/gitlab-ce: major upgrade to 16.7.0
Changelog:
https://about.gitlab.com/releases/2023/12/21/gitlab-16-7-released/
(cherry picked from commit e39f736ac7fd4527f262899f92d137199498a266)
---
devel/gitaly/Makefile | 2 +-
devel/gitaly/distinfo | 10 +--
devel/gitaly/files/patch-config.toml.example | 35 ++++------
devel/gitlab-shell/Makefile | 3 +-
devel/gitlab-shell/distinfo | 10 +--
net/gitlab-agent/Makefile | 3 +-
net/gitlab-agent/distinfo | 10 +--
net/rubygem-gitaly/Makefile | 2 +-
net/rubygem-gitaly/distinfo | 6 +-
www/gitlab-ce/Makefile | 49 +++++++-------
www/gitlab-ce/distinfo | 8 +--
www/gitlab-ce/files/patch-Gemfile | 77 +++++++++++-----------
.../files/patch-config_gitlab.yml.example | 20 +++---
www/gitlab-ce/pkg-message | 4 +-
www/gitlab-pages/Makefile | 2 +-
www/gitlab-pages/distinfo | 10 +--
www/gitlab-workhorse/Makefile | 2 +-
www/gitlab-workhorse/distinfo | 10 +--
18 files changed, 124 insertions(+), 139 deletions(-)
diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index f1c6398bf1ca..8572b1b922b0 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitaly
-DISTVERSION= 16.6.2
+DISTVERSION= 16.7.0
DISTVERSIONPREFIX= v
CATEGORIES= devel
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 5c3e89d3f233..e85152aa3537 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1702530426
-SHA256 (go/devel_gitaly/gitaly-v16.6.2/go.mod) = 116d784159802d477662fb34b1165c4f02fd8caf8ac72718b2c518745dc0ebc3
-SIZE (go/devel_gitaly/gitaly-v16.6.2/go.mod) = 10585
-SHA256 (go/devel_gitaly/gitaly-v16.6.2/gitaly-v16.6.2.tar.bz2) = 5cf8d08d0c0ca5a7b7c4fc09203f8e254f83fddb94b15b51f2b0b0b6049391a9
-SIZE (go/devel_gitaly/gitaly-v16.6.2/gitaly-v16.6.2.tar.bz2) = 2507351
+TIMESTAMP = 1703589799
+SHA256 (go/devel_gitaly/gitaly-v16.7.0/go.mod) = 116d784159802d477662fb34b1165c4f02fd8caf8ac72718b2c518745dc0ebc3
+SIZE (go/devel_gitaly/gitaly-v16.7.0/go.mod) = 10585
+SHA256 (go/devel_gitaly/gitaly-v16.7.0/gitaly-v16.7.0.tar.bz2) = 686816a381c10e1fc6108e532a1227cc3ba4480d84b10b2e645fd04e8f651a92
+SIZE (go/devel_gitaly/gitaly-v16.7.0/gitaly-v16.7.0.tar.bz2) = 2527033
diff --git a/devel/gitaly/files/patch-config.toml.example b/devel/gitaly/files/patch-config.toml.example
index 96757cb8bbc4..eecaf610290f 100644
--- a/devel/gitaly/files/patch-config.toml.example
+++ b/devel/gitaly/files/patch-config.toml.example
@@ -1,29 +1,20 @@
---- config.toml.example.orig 2023-09-21 08:51:45 UTC
+--- config.toml.example.orig 2023-12-20 08:48:30 UTC
+++ config.toml.example
@@ -2,10 +2,10 @@
- # Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and
- # https://docs.gitlab.com/ee//administration/gitaly/reference
+ # For Gitaly documentation, see https://docs.gitlab.com/ee/administration/gitaly/
+ # A path which Gitaly should open a Unix socket.
-socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket"
+socket_path = "%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/gitaly.socket"
- # The directory where Gitaly's executables are stored
+ # Directory containing Gitaly executables.
-bin_dir = "/home/git/gitaly/_build/bin"
+bin_dir = "%%PREFIX%%/share/gitaly/bin/"
- # # Optional: The directory where Gitaly can create all files required to
+ # # Optional. The directory where Gitaly can create all files required to
# # properly operate at runtime. If not set, Gitaly will create a directory in
-@@ -22,7 +22,7 @@ bin_dir = "/home/git/gitaly/_build/bin"
- # # Optional: configure where the Gitaly creates the sockets for internal connections. If unset, Gitaly will create a randomly
- # # named temp directory each time it boots.
- # # Non Gitaly clients should never connect to these sockets.
--# internal_socket_dir = "/home/git/gitlab/tmp/sockets/private/internal"
-+internal_socket_dir = "%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/internal"
-
- # # Optional: authenticate Gitaly requests using a shared secret
- # [auth]
-@@ -33,9 +33,9 @@ bin_dir = "/home/git/gitaly/_build/bin"
- # certificate_path = '/home/git/cert.cert'
+@@ -39,9 +39,9 @@ bin_dir = "/home/git/gitaly/_build/bin"
+ # # Path to the key.
# key_path = '/home/git/key.pem'
-# # Git settings
@@ -35,16 +26,16 @@
# catfile_cache_size = 100
#
# [[git.config]]
-@@ -44,7 +44,7 @@ bin_dir = "/home/git/gitaly/_build/bin"
-
- [[storage]]
+@@ -53,7 +53,7 @@ bin_dir = "/home/git/gitaly/_build/bin"
+ # # The name of the storage
name = "default"
+ # # The path to the storage.
-path = "/home/git/repositories"
+path = "%%PREFIX%%/git/repositories"
# # You can optionally configure more storages for this Gitaly instance to serve up
#
-@@ -54,9 +54,9 @@ path = "/home/git/repositories"
+@@ -63,9 +63,9 @@ path = "/home/git/repositories"
#
# # You can optionally configure Gitaly to output JSON-formatted log messages to stdout
@@ -54,9 +45,9 @@
-dir = "/home/git/gitlab/log"
+dir = "%%PREFIX%%/www/gitlab-ce/log"
# format = "json"
- # # Optional: Set log level to only log entries with that severity or above
+ # # Optional. Set log level to only log entries with that severity or above
# # One of, in order: debug, info, warn, errror, fatal, panic
-@@ -71,11 +71,11 @@ dir = "/home/git/gitlab/log"
+@@ -80,11 +80,11 @@ dir = "/home/git/gitlab/log"
# grpc_latency_buckets = [0.001, 0.005, 0.025, 0.1, 0.5, 1.0, 10.0, 30.0, 60.0, 300.0, 1500.0]
[hooks]
diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile
index e5ba171f326f..ea0f0b06970a 100644
--- a/devel/gitlab-shell/Makefile
+++ b/devel/gitlab-shell/Makefile
@@ -1,6 +1,5 @@
PORTNAME= gitlab-shell
-PORTVERSION= 14.30.1
-PORTREVISION= 1
+PORTVERSION= 14.32.0
DISTVERSIONPREFIX= v
CATEGORIES= devel
diff --git a/devel/gitlab-shell/distinfo b/devel/gitlab-shell/distinfo
index ab448dc49fc3..857d29994681 100644
--- a/devel/gitlab-shell/distinfo
+++ b/devel/gitlab-shell/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1700424728
-SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.30.1/go.mod) = 320101ce7d39bd11a91c2620f8dcdf839efea305912464e30b5b85622ddf321a
-SIZE (go/devel_gitlab-shell/gitlab-shell-v14.30.1/go.mod) = 4794
-SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.30.1/gitlab-shell-v14.30.1.tar.bz2) = adc1672f01c67f53570b13cb247fa6b529702d10f8f77929a46bd879de527da2
-SIZE (go/devel_gitlab-shell/gitlab-shell-v14.30.1/gitlab-shell-v14.30.1.tar.bz2) = 141067
+TIMESTAMP = 1703589928
+SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.32.0/go.mod) = 10b662f9fd5aab451647fe6fd2bd71dc5e9e3d7215ac0ebe7ce77cb9e3c297af
+SIZE (go/devel_gitlab-shell/gitlab-shell-v14.32.0/go.mod) = 4862
+SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.32.0/gitlab-shell-v14.32.0.tar.bz2) = 10e3ede7672da0a648d4d83b13bfcd0da0737248b80e6e786a2928504ceb7e0d
+SIZE (go/devel_gitlab-shell/gitlab-shell-v14.32.0/gitlab-shell-v14.32.0.tar.bz2) = 142573
diff --git a/net/gitlab-agent/Makefile b/net/gitlab-agent/Makefile
index 0c613d1436c0..014701799253 100644
--- a/net/gitlab-agent/Makefile
+++ b/net/gitlab-agent/Makefile
@@ -1,6 +1,5 @@
PORTNAME= gitlab-agent
-PORTVERSION= 16.6.0
-PORTREVISION= 1
+PORTVERSION= 16.7.0
DISTVERSIONPREFIX= v
CATEGORIES= net
diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo
index 27846173c1d1..372c6fa9c41f 100644
--- a/net/gitlab-agent/distinfo
+++ b/net/gitlab-agent/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1700804081
-SHA256 (go/net_gitlab-agent/gitlab-agent-v16.6.0/v16.6.0.mod) = f7f7efc08862476eaeb68ac06ba386ab31ce9059c8ba4c6cf1ed65267cd048a8
-SIZE (go/net_gitlab-agent/gitlab-agent-v16.6.0/v16.6.0.mod) = 7214
-SHA256 (go/net_gitlab-agent/gitlab-agent-v16.6.0/v16.6.0.zip) = 76738c88c8bef326a78946069cb5dbdfeab50a40c0b6589bedd5c06002542047
-SIZE (go/net_gitlab-agent/gitlab-agent-v16.6.0/v16.6.0.zip) = 1229156
+TIMESTAMP = 1703590039
+SHA256 (go/net_gitlab-agent/gitlab-agent-v16.7.0/v16.7.0.mod) = ead54d88689a5a6c3007e0d1015c209fb87caac4b2efd6debd3e60aca3d7b0cf
+SIZE (go/net_gitlab-agent/gitlab-agent-v16.7.0/v16.7.0.mod) = 7185
+SHA256 (go/net_gitlab-agent/gitlab-agent-v16.7.0/v16.7.0.zip) = e668cf4cd9e26162b8d2cdcfdb0a8410c381406a239261e3d880d6aaa9f6a048
+SIZE (go/net_gitlab-agent/gitlab-agent-v16.7.0/v16.7.0.zip) = 1230473
diff --git a/net/rubygem-gitaly/Makefile b/net/rubygem-gitaly/Makefile
index d0402bbf2488..58aa2c5abc01 100644
--- a/net/rubygem-gitaly/Makefile
+++ b/net/rubygem-gitaly/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitaly
-PORTVERSION= 16.5.0
+PORTVERSION= 16.7.0
CATEGORIES= net rubygems
MASTER_SITES= RG
diff --git a/net/rubygem-gitaly/distinfo b/net/rubygem-gitaly/distinfo
index b88751262acf..9710ff3117c1 100644
--- a/net/rubygem-gitaly/distinfo
+++ b/net/rubygem-gitaly/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1698068860
-SHA256 (rubygem/gitaly-16.5.0.gem) = 12255ff84508f2aadc55310f68f38f5f803092b4b85ba2ab461a2179adae34ed
-SIZE (rubygem/gitaly-16.5.0.gem) = 44544
+TIMESTAMP = 1703588627
+SHA256 (rubygem/gitaly-16.7.0.gem) = bd88d25a917c22331f6268792ceb37995b006940fe4c5715f050d2f42568fd85
+SIZE (rubygem/gitaly-16.7.0.gem) = 45568
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index ad9e40f0e100..5ebac168d621 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -1,6 +1,5 @@
PORTNAME= gitlab-ce
-PORTVERSION= 16.6.2
-PORTREVISION= 2
+PORTVERSION= 16.7.0
DISTVERSIONPREFIX= v
CATEGORIES= www devel
@@ -26,9 +25,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
MY_DEPENDS= git>=2.41.0:devel/git \
gitaly>=${PORTVERSION}:devel/gitaly \
gitlab-elasticsearch-indexer>=4.5.0:textproc/gitlab-elasticsearch-indexer \
- gitlab-agent>=16.6.0:net/gitlab-agent \
+ gitlab-agent>=16.7.0:net/gitlab-agent \
gitlab-pages>=${PORTVERSION}:www/gitlab-pages \
- gitlab-shell>=14.30.0:devel/gitlab-shell \
+ gitlab-shell>=14.32.0:devel/gitlab-shell \
gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \
redis>=6.2.11:databases/redis \
yarn${NODEJS_SUFFIX}>=1.10.0:www/yarn${NODEJS_SUFFIX} \
@@ -38,13 +37,12 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-net-pop>=0:mail/rubygem-net-pop \
rubygem-psych3>=3.1<4:textproc/rubygem-psych3 \
rubygem-rails70>=7.0.8<7.1:www/rubygem-rails70 \
- rubygem-vite_rails-rails70>=0:devel/rubygem-vite_rails-rails70 \
rubygem-bootsnap>=1.17.0<1.18:devel/rubygem-bootsnap \
rubygem-openssl>=3.0<4:security/rubygem-openssl \
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.7.0<3.8:devel/rubygem-view_component-rails70 \
+ rubygem-view_component-rails70>=3.8.0<3.9:devel/rubygem-view_component-rails70 \
rubygem-pg>=1.5.4<1.6:databases/rubygem-pg \
rubygem-neighbor>=0.2.3<0.3:databases/rubygem-neighbor \
rubygem-rugged>=1.6<2:devel/rubygem-rugged \
@@ -111,8 +109,9 @@ MY_DEPENDS= git>=2.41.0:devel/git \
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.8.0<1.9:net/rubygem-gitlab-fog-azure-rm \
- rubygem-google-cloud-storage144>=1.44.0<1.45:net/rubygem-google-cloud-storage144 \
- rubygem-google-apis-core>=0.10.0<0.12:devel/rubygem-google-apis-core \
+ rubygem-google-apis-storage_v1>=0.29<1:devel/rubygem-google-apis-storage_v1 \
+ rubygem-google-cloud-storage>=1.45.0<1.46:net/rubygem-google-cloud-storage \
+ rubygem-google-apis-core>=0.11.2<0.12:devel/rubygem-google-apis-core \
rubygem-google-apis-compute_v1_057>=0.57.0<0.58:devel/rubygem-google-apis-compute_v1_057 \
rubygem-google-apis-container_v1>=0.43.0<0.44:devel/rubygem-google-apis-container_v1 \
rubygem-google-apis-container_v1beta1>=0.43.0<0.44:devel/rubygem-google-apis-container_v1beta1 \
@@ -126,9 +125,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.186.0<4:devel/rubygem-aws-sdk-core \
+ rubygem-aws-sdk-core>=3.190.0<4:devel/rubygem-aws-sdk-core \
rubygem-aws-sdk-cloudformation>=1<2:devel/rubygem-aws-sdk-cloudformation \
- rubygem-aws-sdk-s3>=1.136.0<2:devel/rubygem-aws-sdk-s3 \
+ rubygem-aws-sdk-s3>=1.141.0<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 \
@@ -146,10 +145,9 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-asciidoctor-kroki>=0.8.0<0.9:textproc/rubygem-asciidoctor-kroki \
rubygem-rouge>=4.2.0<4.3:textproc/rubygem-rouge \
rubygem-truncato>=0.7.12<0.8.0:textproc/rubygem-truncato \
- rubygem-nokogiri>=1.15.4<2:textproc/rubygem-nokogiri \
+ rubygem-nokogiri>=1.15.5<2:textproc/rubygem-nokogiri \
rubygem-icalendar>=0:devel/rubygem-icalendar \
rubygem-diffy>=3.4<4:textproc/rubygem-diffy \
- rubygem-diff_match_patch>=0.1.0<0.2.0:textproc/rubygem-diff_match_patch \
rubygem-rack22>=2.2.8,3<2.3,3:www/rubygem-rack22 \
rubygem-rack-timeout>=0.6.3<0.7:www/rubygem-rack-timeout \
rubygem-puma>=6.4<7:www/rubygem-puma \
@@ -157,17 +155,18 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-state_machines-activerecord08>=0.8.0<0.9.0:databases/rubygem-state_machines-activerecord08 \
rubygem-acts-as-taggable-on>=10.0<11:www/rubygem-acts-as-taggable-on \
rubygem-sidekiq6>=6.5.10<6.6:devel/rubygem-sidekiq6 \
- rubygem-sidekiq-cron18>=1.8.0<1.9:devel/rubygem-sidekiq-cron18 \
+ rubygem-sidekiq-cron-rails70>=1.12.0<1.13:devel/rubygem-sidekiq-cron-rails70 \
rubygem-fugit18>=1.8.1<1.9:devel/rubygem-fugit18 \
rubygem-httparty>=0.21.0<0.22:www/rubygem-httparty \
rubygem-rainbow>=3.1.1<4.0:devel/rubygem-rainbow \
rubygem-ruby-progressbar>=1.11<2:devel/rubygem-ruby-progressbar \
- rubygem-re2>=2.3.0<2.4:devel/rubygem-re2 \
+ rubygem-re2>=2.5.0<2.6:devel/rubygem-re2 \
rubygem-semver_dialects>=1.5<2:devel/rubygem-semver_dialects \
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-redis4>=4.8.0<4.8.2:databases/rubygem-redis4 \
+ rubygem-redis-namespace110>=1.10.0<1.11:databases/rubygem-redis-namespace110 \
rubygem-connection_pool>=2.4.1<3.0:net/rubygem-connection_pool \
rubygem-redis-actionpack-rails70>=5.3.0<5.4:databases/rubygem-redis-actionpack-rails70 \
rubygem-discordrb-webhooks>=3.4<4.0:net-im/rubygem-discordrb-webhooks \
@@ -180,7 +179,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \
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-loofah221>=2.21.4<2.22:textproc/rubygem-loofah221 \
+ rubygem-loofah>=2.22.0<2.23:textproc/rubygem-loofah \
rubygem-licensee>=9.16<10:devel/rubygem-licensee \
rubygem-charlock_holmes>=0.7.7<0.8.0:textproc/rubygem-charlock_holmes \
rubygem-ruby-magic>=0.6<1:devel/rubygem-ruby-magic \
@@ -199,28 +198,27 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-gitlab-license>=2.3<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.8.0<5.9:devel/rubygem-sentry-ruby \
- rubygem-sentry-rails>=5.8.0<5.9:devel/rubygem-sentry-rails \
- rubygem-sentry-sidekiq>=5.8.0<5.9:devel/rubygem-sentry-sidekiq \
+ 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-pg_query>=4.2.3<4.3:databases/rubygem-pg_query \
rubygem-premailer-rails110-rails70>=1.10.3<1.11:mail/rubygem-premailer-rails110-rails70 \
rubygem-gitlab-labkit>=0.34.0<0.35: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-gettext_i18n_rails111>=1.11.0<1.12.0:devel/rubygem-gettext_i18n_rails111 \
- rubygem-gettext_i18n_rails_js-rails70>=2.0.0<2.1:devel/rubygem-gettext_i18n_rails_js-rails70 \
rubygem-gettext>=3.3<4:devel/rubygem-gettext \
rubygem-batch-loader>=2.0.1<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>=0.28.1<0.29:devel/rubygem-prometheus-client-mmap \
+ rubygem-prometheus-client-mmap>=1.0.2<1.1:devel/rubygem-prometheus-client-mmap \
rubygem-warning>=1.3.0<1.4:devel/rubygem-warning \
rubygem-gitlab-dangerfiles>=4.6.0<4.7:devel/rubygem-gitlab-dangerfiles \
rubygem-license_finder>=7.0.0<8:devel/rubygem-license_finder \
rubygem-rspec>=3.0<4:devel/rubygem-rspec \
rubygem-octokit6>=6.0<7:net/rubygem-octokit6 \
- rubygem-gitlab-mail_room>=0.0.23<0.1.0:mail/rubygem-gitlab-mail_room \
+ rubygem-gitlab-mail_room>=0.0.24<0.1.0:mail/rubygem-gitlab-mail_room \
rubygem-email_reply_trimmer>=0.1<1.0:mail/rubygem-email_reply_trimmer \
rubygem-html2text>=0:textproc/rubygem-html2text \
rubygem-stackprof>=0.2.25<0.3:devel/rubygem-stackprof \
@@ -234,16 +232,16 @@ 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.5.0.rc1<16.6.0:net/rubygem-gitaly \
- rubygem-kas-grpc>=0.2.0,1<0.3.0,1:net/rubygem-kas-grpc \
+ rubygem-gitaly>=16.7.0.rc1<16.8.0:net/rubygem-gitaly \
+ rubygem-kas-grpc>=0.3.0,1<0.4.0,1:net/rubygem-kas-grpc \
rubygem-grpc>=1.58.0<2:net/rubygem-grpc \
- rubygem-google-protobuf>=3.25<4:devel/rubygem-google-protobuf \
+ rubygem-google-protobuf>=3.25.1<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 \
rubygem-flipper-active_record-rails70>=0.26.2<0.27:databases/rubygem-flipper-active_record-rails70 \
rubygem-flipper-active_support_cache_store-rails70>=0.26.2<0.27:devel/rubygem-flipper-active_support_cache_store-rails70 \
rubygem-unleash>=3.2.2<3.3:devel/rubygem-unleash \
- rubygem-gitlab-experiment>=0.8.0<0.9:devel/rubygem-gitlab-experiment \
+ rubygem-gitlab-experiment>=0.9.1<0.10:devel/rubygem-gitlab-experiment \
rubygem-lograge-rails70>=0.11.2<1.0:www/rubygem-lograge-rails70 \
rubygem-grape_logging>=1.8<2.0:devel/rubygem-grape_logging \
rubygem-gitlab-net-dns>=0.9.2<0.10:dns/rubygem-gitlab-net-dns \
@@ -274,6 +272,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-net-protocol01>=0.1.3<0.2:net/rubygem-net-protocol01 \
rubygem-net-http011>=0.1.1<0.1.2:www/rubygem-net-http011 \
rubygem-duo_api>=1.3<2:security/rubygem-duo_api \
+ rubygem-gitlab-sdk>0:devel/rubygem-gitlab-sdk \
rubygem-google-cloud-profiler-v2>=0.3<1:textproc/rubygem-google-cloud-profiler-v2
BUILD_DEPENDS= gem:devel/ruby-gems \
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index de0b7ad826b0..78ee2a0719d2 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1702530421
-SHA256 (gitlab-foss-v16.6.2.tar.bz2) = fba845ee5fc318da3c42f6256297d083f1134720815807b97c2e2610dc8cbc51
-SIZE (gitlab-foss-v16.6.2.tar.bz2) = 100424350
-SHA256 (138018.patch) = 2aaa34cc9e58c0220ffb3e13ae2ec10f62a3e3b18e5f684adbaf2d90745c1353
-SIZE (138018.patch) = 6399
+TIMESTAMP = 1703586779
+SHA256 (gitlab-foss-v16.7.0.tar.bz2) = e99aa64c2ca7f6bdbff9385632ac90a1e82f89140f02cdb87bdd5391bc865d20
+SIZE (gitlab-foss-v16.7.0.tar.bz2) = 99345526
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index 0b578297fccc..8ee00491f7a2 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -1,6 +1,6 @@
---- Gemfile.orig 2023-11-15 09:14:25 UTC
+--- Gemfile.orig 2023-12-20 08:52:18 UTC
+++ Gemfile
-@@ -57,7 +57,7 @@ gem 'neighbor', '~> 0.2.3' # rubocop:todo Gemfile/Miss
+@@ -58,7 +58,7 @@ gem 'neighbor', '~> 0.2.3' # rubocop:todo Gemfile/Miss
gem 'rugged', '~> 1.6' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -9,7 +9,7 @@
gem 'marginalia', '~> 1.11.1' # rubocop:todo Gemfile/MissingFeatureCategory
# Authorization
-@@ -77,8 +77,8 @@ gem 'omniauth-azure-activedirectory-v2', '~> 2.0' # ru
+@@ -78,8 +78,8 @@ gem 'omniauth-azure-activedirectory-v2', '~> 2.0' # ru
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
gem 'omniauth-alicloud', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -20,7 +20,7 @@
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
-@@ -89,7 +89,7 @@ gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/o
+@@ -90,7 +90,7 @@ gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/o
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,38 +29,29 @@
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
-@@ -179,7 +179,7 @@ gem 'gitlab-fog-azure-rm', '~> 1.8.0', require: 'fog/a
-
- # for Google storage
- gem 'google-cloud-storage', '~> 1.44.0' # rubocop:todo Gemfile/MissingFeatureCategory
--gem 'google-apis-core', '~> 0.10.0' # rubocop:todo Gemfile/MissingFeatureCategory
-+gem 'google-apis-core', '~> 0.10' # rubocop:todo Gemfile/MissingFeatureCategory
- 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
-@@ -197,9 +197,9 @@ gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/Missi
+@@ -203,9 +203,9 @@ gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/Missi
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.186.0' # rubocop:todo Gemfile/MissingFeatureCategory
-+gem 'aws-sdk-core', '~> 3.186' # rubocop:todo Gemfile/MissingFeatureCategory
+-gem 'aws-sdk-core', '~> 3.190.0' # rubocop:todo Gemfile/MissingFeatureCategory
++gem 'aws-sdk-core', '~> 3.190' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory
--gem 'aws-sdk-s3', '~> 1.136.0' # rubocop:todo Gemfile/MissingFeatureCategory
-+gem 'aws-sdk-s3', '~> 1.136' # rubocop:todo Gemfile/MissingFeatureCategory
+-gem 'aws-sdk-s3', '~> 1.141.0' # rubocop:todo Gemfile/MissingFeatureCategory
++gem 'aws-sdk-s3', '~> 1.141' # 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
-@@ -385,86 +385,10 @@ gem 'prometheus-client-mmap', '~> 0.28', '>= 0.28.1',
+@@ -391,93 +391,10 @@ gem 'prometheus-client-mmap', '~> 1.0', '>= 1.0.2', re
gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
-group :development do
-- gem 'lefthook', '~> 1.5.2', require: false, feature_category: :tooling
+- gem 'lefthook', '~> 1.5.5', require: false, feature_category: :tooling
- gem 'rubocop', feature_category: :tooling
- 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.0', '>= 2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory
+- gem 'lookbook', '~> 2.2' # rubocop:todo Gemfile/MissingFeatureCategory
-
- # Better errors handler
- gem 'better_errors', '~> 2.10.1' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -69,11 +60,11 @@
-
- gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory
-
-- gem 'ruby-lsp', "~> 0.12.3", feature_category: :tooling
+- gem 'ruby-lsp', "~> 0.13.1", require: false, feature_category: :tooling
-
-- gem 'ruby-lsp-rails', "~> 0.2.7", feature_category: :tooling
+- gem 'ruby-lsp-rails', "~> 0.2.8", feature_category: :tooling
-
-- gem 'ruby-lsp-rspec', "~> 0.1.5", feature_category: :tooling
+- gem 'ruby-lsp-rspec', "~> 0.1.8", require: false, feature_category: :tooling
-end
-
-group :development, :test do
@@ -88,7 +79,7 @@
-
- gem 'database_cleaner-active_record', '~> 2.1.0', feature_category: :database
- gem 'factory_bot_rails', '~> 6.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
-- gem 'rspec-rails', '~> 6.0.3' # rubocop:todo Gemfile/MissingFeatureCategory
+- gem 'rspec-rails', '~> 6.1.0', feature_category: :shared
-
- # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
- gem 'minitest', '~> 5.11.0' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -98,7 +89,7 @@
-
- gem 'gitlab-styles', '~> 11.0.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-
-- gem 'haml_lint', '~> 0.40.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
+- gem 'haml_lint', '~> 0.52', require: false # rubocop:todo Gemfile/MissingFeatureCategory
- gem 'bundler-audit', '~> 0.9.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-
- # Benchmarking & profiling
@@ -121,6 +112,13 @@
- gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup' # rubocop:todo Gemfile/MissingFeatureCategory
-
- gem 'pact', '~> 1.63' # rubocop:todo Gemfile/MissingFeatureCategory
+-
+- # For now we only use vite in development / test, and not for production builds
+- # See: https://gitlab.com/gitlab-org/frontend/rfcs/-/issues/106
+- gem 'vite_rails', '~> 3.0.17', feature_category: :shared
+- gem 'vite_ruby', '~> 3.5.0', feature_category: :shared
+-
+- gem 'gitlab-housekeeper', path: 'gems/gitlab-housekeeper', feature_category: :tooling
-end
-
group :development, :test, :danger do
@@ -137,8 +135,8 @@
# Gems required in omnibus-gitlab pipeline
group :development, :test, :omnibus do
gem 'license_finder', '~> 7.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-@@ -476,35 +400,6 @@ group :development, :test, :monorepo do
- gem 'rspec_flaky', path: 'gems/rspec_flaky' # rubocop:todo Gemfile/MissingFeatureCategory
+@@ -489,36 +406,6 @@ group :development, :test, :monorepo do
+ gem 'gitlab-rspec_flaky', path: 'gems/gitlab-rspec_flaky', feature_category: :tooling
end
-group :test do
@@ -147,10 +145,11 @@
- gem 'rspec_profiling', '~> 0.0.6', feature_category: :tooling
- gem 'rspec-benchmark', '~> 0.6.0', feature_category: :tooling
- gem 'rspec-parameterized', '~> 1.0', require: false, feature_category: :tooling
+- gem 'os', '~> 1.1', feature_category: :tooling
-
- gem 'capybara', '~> 3.39', '>= 3.39.2' # rubocop:todo Gemfile/MissingFeatureCategory
- gem 'capybara-screenshot', '~> 1.0.26' # rubocop:todo Gemfile/MissingFeatureCategory
-- gem 'selenium-webdriver', '~> 4.15' # rubocop:todo Gemfile/MissingFeatureCategory
+- gem 'selenium-webdriver', '~> 4.16' # rubocop:todo Gemfile/MissingFeatureCategory
-
- gem 'graphlyte', '~> 1.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
-
@@ -159,7 +158,7 @@
- gem 'webmock', '~> 3.19.1' # rubocop:todo Gemfile/MissingFeatureCategory
- gem 'rails-controller-testing' # rubocop:todo Gemfile/MissingFeatureCategory
- gem 'concurrent-ruby', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory
-- gem 'test-prof', '~> 1.2.3' # rubocop:todo Gemfile/MissingFeatureCategory
+- gem 'test-prof', '~> 1.3.1' # rubocop:todo Gemfile/MissingFeatureCategory
- gem 'rspec_junit_formatter' # rubocop:todo Gemfile/MissingFeatureCategory
- gem 'guard-rspec' # rubocop:todo Gemfile/MissingFeatureCategory
- gem 'axe-core-rspec' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -167,22 +166,22 @@
- # 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.5.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
+- gem 'gitlab_quality-test_tooling', '~> 1.9.0', require: false, feature_category: :tooling
-end
-
gem 'octokit', '~> 6.0' # rubocop:todo Gemfile/MissingFeatureCategory
- gem 'gitlab-mail_room', '~> 0.0.23', require: 'mail_room' # rubocop:todo Gemfile/MissingFeatureCategory
-@@ -542,7 +437,7 @@ gem 'gitaly', '~> 16.5.0.pre.rc1' # rubocop:todo Gemfi
+ gem 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :shared
+@@ -556,7 +443,7 @@ gem 'gitaly', '~> 16.7.0-rc1', feature_category: :gita
# KAS GRPC protocol definitions
- gem 'kas-grpc', '~> 0.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
+ gem 'kas-grpc', '~> 0.3.0', feature_category: :deployment_management
-gem 'grpc', '~> 1.58.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'grpc', '~> 1.58' # rubocop:todo Gemfile/MissingFeatureCategory
- gem 'google-protobuf', '~> 3.25' # rubocop:todo Gemfile/MissingFeatureCategory
+ gem 'google-protobuf', '~> 3.25', '>= 3.25.1' # rubocop:todo Gemfile/MissingFeatureCategory
-@@ -563,7 +458,7 @@ gem 'grape_logging', '~> 1.8', feature_category: :api
+@@ -577,7 +464,7 @@ gem 'grape_logging', '~> 1.8', feature_category: :api
gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfile/MissingFeatureCategory
# Countries list
@@ -191,7 +190,7 @@
gem 'retriable', '~> 3.1.2' # rubocop:todo Gemfile/MissingFeatureCategory
-@@ -629,6 +524,7 @@ gem 'app_store_connect' # rubocop:todo Gemfile/Missing
+@@ -643,6 +530,7 @@ gem 'app_store_connect' # rubocop:todo Gemfile/Missing
gem 'telesignenterprise', '~> 2.2' # rubocop:todo Gemfile/MissingFeatureCategory
# BufferedIO patch
@@ -199,7 +198,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:
-@@ -636,3 +532,9 @@ gem 'net-protocol', '~> 0.1.3' # rubocop:todo Gemfile/
+@@ -650,5 +538,11 @@ gem 'net-protocol', '~> 0.1.3' # rubocop:todo Gemfile/
gem 'net-http', '= 0.1.1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -209,3 +208,5 @@
+gem 'net-pop'
+gem 'psych', '~> 3.1'
+
+
+ gem 'gitlab-sdk', feature_category: :application_instrumentation
diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example
index 02fa13f7f741..cea4c406e5d0 100644
--- a/www/gitlab-ce/files/patch-config_gitlab.yml.example
+++ b/www/gitlab-ce/files/patch-config_gitlab.yml.example
@@ -1,4 +1,4 @@
---- config/gitlab.yml.example.orig 2023-10-20 08:41:39 UTC
+--- config/gitlab.yml.example.orig 2023-12-20 08:52:18 UTC
+++ config/gitlab.yml.example
@@ -456,7 +456,7 @@ production: &base
## GitLab Pages
@@ -22,14 +22,12 @@
# 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).
-@@ -1196,14 +1196,14 @@ production: &base
- # real path not the symlink.
+@@ -1194,13 +1194,13 @@ production: &base
+ repositories:
storages: # You must have at least a `default` storage path.
default:
-- path: /home/git/repositories/
- gitaly_address: unix:/home/git/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port).
-+ path: %%PREFIX%%/git/repositories/
-+ gitaly_address: unix:%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port) # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port).
++ gitaly_address: unix:%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port).
# gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.
## Backup settings
@@ -40,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
-@@ -1238,12 +1238,12 @@ production: &base
+@@ -1235,12 +1235,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@@ -56,7 +54,7 @@
# Git over HTTP
upload_pack: true
-@@ -1258,13 +1258,13 @@ production: &base
+@@ -1255,13 +1255,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).
@@ -72,7 +70,7 @@
# The URL to the external KAS API (used by the Kubernetes agents)
# external_url: wss://kas.example.com
-@@ -1288,13 +1288,13 @@ production: &base
+@@ -1285,13 +1285,13 @@ production: &base
## GitLab Elasticsearch settings
elasticsearch:
@@ -88,7 +86,7 @@
## Webpack settings
# If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
-@@ -1315,18 +1315,18 @@ production: &base
+@@ -1312,18 +1312,18 @@ production: &base
# Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq.
sidekiq_exporter:
@@ -114,7 +112,7 @@
# Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma.
web_exporter:
-@@ -1551,13 +1551,13 @@ test:
+@@ -1548,13 +1548,13 @@ test:
gitaly_address: unix:tmp/tests/gitaly/praefect.socket
gitaly:
diff --git a/www/gitlab-ce/pkg-message b/www/gitlab-ce/pkg-message
index c496cd992353..34446375033b 100644
--- a/www/gitlab-ce/pkg-message
+++ b/www/gitlab-ce/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.6-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/16.7-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.5-16.6-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/16.6-16.7-freebsd.md
If you just installed an minor upgrade of GitLab please follow
the instructions in the guide at:
diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile
index 0041e78be0b6..53cba509e623 100644
--- a/www/gitlab-pages/Makefile
+++ b/www/gitlab-pages/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitlab-pages
-PORTVERSION= 16.6.2
+PORTVERSION= 16.7.0
DISTVERSIONPREFIX= v
CATEGORIES= www
MASTER_SITES+= https://gitlab.com/gitlab-org/gitlab-pages/-/raw/v${DISTVERSION}/
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
index 42617b4190b7..20edc0354baa 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1702530446
-SHA256 (go/www_gitlab-pages/gitlab-pages-v16.6.2/go.mod) = 896ed13d735e4b95bdedd317e789dd6429222d38c651f1baae0bed413d5602a6
-SIZE (go/www_gitlab-pages/gitlab-pages-v16.6.2/go.mod) = 2931
-SHA256 (go/www_gitlab-pages/gitlab-pages-v16.6.2/gitlab-pages-v16.6.2.tar.bz2) = f5ee7eaac98abd49c5207475967b11b1eacaa2e8018674ea63ea82e9797b4e41
-SIZE (go/www_gitlab-pages/gitlab-pages-v16.6.2/gitlab-pages-v16.6.2.tar.bz2) = 203495
+TIMESTAMP = 1703662954
+SHA256 (go/www_gitlab-pages/gitlab-pages-v16.7.0/go.mod) = 2e395b62e4dae09814ebcaee28a9d1382514e09e3882ba7046ca8aa90f432ff2
+SIZE (go/www_gitlab-pages/gitlab-pages-v16.7.0/go.mod) = 3322
+SHA256 (go/www_gitlab-pages/gitlab-pages-v16.7.0/gitlab-pages-v16.7.0.tar.bz2) = ad305ca235f9b193378f012d516914f37adc6d4f5f4f2e02593ce2919910d628
+SIZE (go/www_gitlab-pages/gitlab-pages-v16.7.0/gitlab-pages-v16.7.0.tar.bz2) = 206543
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index 84c1b162c22c..ade27da4f312 100644
--- a/www/gitlab-workhorse/Makefile
+++ b/www/gitlab-workhorse/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitlab-workhorse
-PORTVERSION= 16.6.2
+PORTVERSION= 16.7.0
DISTVERSIONPREFIX= v
CATEGORIES= www
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index e75b4c0a3e04..bfb52df212d9 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1702530356
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.6.2/go.mod) = 98d1e08c1c106673b32c20697c616efeca50d2b698293aa282fd75be90e89b82
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.6.2/go.mod) = 6781
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.6.2/gitlab-foss-v16.6.2.tar.bz2) = fba845ee5fc318da3c42f6256297d083f1134720815807b97c2e2610dc8cbc51
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.6.2/gitlab-foss-v16.6.2.tar.bz2) = 100424350
+TIMESTAMP = 1703586703
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.7.0/go.mod) = e98235bbbe2ee568f1461c6d08170eadf46e36fdadd6bd089d35c21367fe2759
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.7.0/go.mod) = 6689
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.7.0/gitlab-foss-v16.7.0.tar.bz2) = e99aa64c2ca7f6bdbff9385632ac90a1e82f89140f02cdb87bdd5391bc865d20
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.7.0/gitlab-foss-v16.7.0.tar.bz2) = 99345526