www/gitlab-ce: major upgrade to 16.8.0

Changelog:
https://about.gitlab.com/releases/2024/01/18/gitlab-16-8-released/

devel/gitaly/Makefile

@@ -1,6 +1,5 @@
 PORTNAME=	gitaly
-DISTVERSION=	16.7.5
-PORTREVISION=	1
+DISTVERSION=	16.8.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
@@ -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.42.0:devel/git
+MY_DEPENDS=	git>=2.43.0:devel/git
 BUILD_DEPENDS=	bash>0:shells/bash \
 		${LOCALBASE}/bin/cmake:devel/cmake-core \
 		pcre2>0:devel/pcre2 \

devel/gitaly/distinfo

@@ -1,5 +1,5 @@
-TIMESTAMP = 1707409945
-SHA256 (go/devel_gitaly/gitaly-v16.7.5/go.mod) = 116d784159802d477662fb34b1165c4f02fd8caf8ac72718b2c518745dc0ebc3
-SIZE (go/devel_gitaly/gitaly-v16.7.5/go.mod) = 10585
-SHA256 (go/devel_gitaly/gitaly-v16.7.5/gitaly-v16.7.5.tar.bz2) = d747bd250ccfcd6a5dc882dcb000dbe5ba8a6941796c96df055762081c35a6d0
-SIZE (go/devel_gitaly/gitaly-v16.7.5/gitaly-v16.7.5.tar.bz2) = 2531724
+TIMESTAMP = 1705827282
+SHA256 (go/devel_gitaly/gitaly-v16.8.0/go.mod) = 114e8afe5f7e9000677d449a0d55972d9845f8c237cfc3eb98d673cf886006a7
+SIZE (go/devel_gitaly/gitaly-v16.8.0/go.mod) = 10585
+SHA256 (go/devel_gitaly/gitaly-v16.8.0/gitaly-v16.8.0.tar.bz2) = b8f0009b58afb95984fa280bcab8eafd98e6a0d740478735a8df44f93ccee40c
+SIZE (go/devel_gitaly/gitaly-v16.8.0/gitaly-v16.8.0.tar.bz2) = 2554011

devel/gitaly/files/patch-config.toml.example

@@ -1,7 +1,7 @@
---- config.toml.example.orig	2023-12-20 08:48:30 UTC
+--- config.toml.example.orig	2024-01-17 10:05:29 UTC
 +++ config.toml.example
 @@ -2,10 +2,10 @@
- # For Gitaly documentation, see https://docs.gitlab.com/ee/administration/gitaly/
+ # 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"
@@ -13,20 +13,20 @@
 
  # # Optional. The directory where Gitaly can create all files required to
  # # properly operate at runtime. If not set, Gitaly will create a directory in
-@@ -39,9 +39,9 @@ bin_dir = "/home/git/gitaly/_build/bin"
- # # Path to the key.
+@@ -40,9 +40,9 @@ bin_dir = "/home/git/gitaly/_build/bin"
  # key_path = '/home/git/key.pem'
 
--# # Git settings
+ # # Git settings
 -# [git]
+-# # Path to Git binary. If not set, is resolved using PATH.
 -# bin_path = "/usr/bin/git"
-+# Git settings
 +[git]
++# Path to Git binary. If not set, is resolved using PATH.
 +bin_path = "%%PREFIX%%/bin/git"
+ # # Maximum number of cached 'cat-file' processes, which constitute a pair of 'git cat-file --batch' and
+ # # 'git cat-file --batch-check' processes. Defaults to '100'.
  # catfile_cache_size = 100
- #
- # [[git.config]]
-@@ -53,7 +53,7 @@ bin_dir = "/home/git/gitaly/_build/bin"
+@@ -58,7 +58,7 @@ bin_dir = "/home/git/gitaly/_build/bin"
  # # The name of the storage
  name = "default"
  # # The path to the storage.
@@ -35,30 +35,38 @@
 
  # # You can optionally configure more storages for this Gitaly instance to serve up
  #
-@@ -63,9 +63,9 @@ path = "/home/git/repositories"
+@@ -68,9 +68,9 @@ path = "/home/git/repositories"
  #
 
- # # You can optionally configure Gitaly to output JSON-formatted log messages to stdout
+ # # Optional. Configure Gitaly to output JSON-formatted log messages to stdout.
 -# [logging]
-+[logging]
- # # The directory where Gitaly stores extra log files
+-# # Directory where Gitaly stores extra log files.
 -dir = "/home/git/gitlab/log"
++[logging]
++# Directory where Gitaly stores extra log files.
 +dir = "%%PREFIX%%/www/gitlab-ce/log"
+ # # Log format. Either 'text' or 'json'.
  # format = "json"
- # # Optional. Set log level to only log entries with that severity or above
- # # One of, in order: debug, info, warn, errror, fatal, panic
-@@ -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]
-
+ # # Optional. Set log level to only log entries with that severity or above.
+@@ -91,18 +91,18 @@ sentry_environment = ""
+ # # Custom Git hooks that are used to perform tasks based on changes performed in any repository.
  [hooks]
+ # # Directory where custom Git hooks are installed. If left unset, no custom hooks are used.
 -custom_hooks_dir = "/home/git/custom_hooks"
 +custom_hooks_dir = "%%PREFIX%%/git/custom_hooks"
 
+ # # Gitaly must connect to the GitLab application to perform access checks when a user performs a change.
  [gitlab]
--secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret"
+ # # URL of the GitLab server.
 -url = "http+unix://%2Fhome%2Fgit%2Fgitlab%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket"
-+secret_file = "%%PREFIX%%/share/gitlab-shell/.gitlab_shell_secret"
 +url = "http+unix://%2Fusr%2Flocal%2Fwww%2Fgitlab-ce%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket"
- # Only needed if a UNIX socket is used in `url` and GitLab is configured to
- # use a relative path (e.g. /gitlab).
+ # # 'relative_url_root' is only needed if a UNIX socket is used in 'url' and GitLab is configured to
+ # # use a relative path. For example, '/gitlab'.
  # relative_url_root = '/'
+ # # Path of the file containing the secret token used to authenticate with GitLab. Use either 'secret_token' or 'secret'
+ # # but not both.
+-secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret"
++secret_file = "%%PREFIX%%/share/gitlab-shell/.gitlab_shell_secret"
+ # # Secret token used to authenticate with GitLab.
+ # secret = ""
+

net/gitlab-agent/Makefile

@@ -1,6 +1,5 @@
 PORTNAME=	gitlab-agent
-PORTVERSION=	16.7.0
-PORTREVISION=	1
+PORTVERSION=	16.8.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 

net/gitlab-agent/distinfo

@@ -1,5 +1,5 @@
-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
+TIMESTAMP = 1706246360
+SHA256 (go/net_gitlab-agent/gitlab-agent-v16.8.0/v16.8.0.mod) = 096d0a40c53e3e0cfb3ab7c82ba0a0a3560b9f28f997669c2e92c1a6aa5805ba
+SIZE (go/net_gitlab-agent/gitlab-agent-v16.8.0/v16.8.0.mod) = 7238
+SHA256 (go/net_gitlab-agent/gitlab-agent-v16.8.0/v16.8.0.zip) = d68f6448e9f950605925a628b45f1ca86e371a18253a8a78091bdac4ae20374b
+SIZE (go/net_gitlab-agent/gitlab-agent-v16.8.0/v16.8.0.zip) = 1226400

textproc/gitlab-elasticsearch-indexer/Makefile

@@ -1,6 +1,5 @@
 PORTNAME=	gitlab-elasticsearch-indexer
-PORTVERSION=	4.5.0
-PORTREVISION=	2
+PORTVERSION=	4.6.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	textproc
 

textproc/gitlab-elasticsearch-indexer/distinfo

@@ -1,5 +1,5 @@
-TIMESTAMP = 1700763661
-SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.5.0/go.mod) = 1b4e18ed56e2774615bf8c5bdbf2133be0366917d4907fbc7e27b3f82b8f0ba1
-SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.5.0/go.mod) = 4653
-SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.5.0/gitlab-elasticsearch-indexer-v4.5.0.tar.bz2) = 6e48387f8118bdee6d6c7b0bc856f5d02e8890a4f557373b377ac5fcd778aea0
-SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.5.0/gitlab-elasticsearch-indexer-v4.5.0.tar.bz2) = 59249
+TIMESTAMP = 1705862004
+SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.6.0/go.mod) = 1e09030556aa2aff46f7acd2d2fd6dd9366a2c4e8e0bddaa0bb041d9722d2c91
+SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.6.0/go.mod) = 4722
+SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.6.0/gitlab-elasticsearch-indexer-v4.6.0.tar.bz2) = c26b442198a4010019527ab6488329dce99f12d8cb5a528ed7e5dcfb5da912c4
+SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.6.0/gitlab-elasticsearch-indexer-v4.6.0.tar.bz2) = 59537

www/gitlab-ce/Makefile

@@ -1,6 +1,5 @@
 PORTNAME=	gitlab-ce
-PORTVERSION=	16.7.5
-PORTREVISION=	1
+PORTVERSION=	16.8.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www devel
 
@@ -25,8 +24,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 # mail/rubygem-net-pop is required as ruby 3.1 removed it
 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.7.0:net/gitlab-agent \
+	gitlab-elasticsearch-indexer>=4.6.0:textproc/gitlab-elasticsearch-indexer \
+	gitlab-agent>=16.8.0:net/gitlab-agent \
 	gitlab-pages>=${PORTVERSION}:www/gitlab-pages \
 	gitlab-shell>=14.32.0:devel/gitlab-shell \
 	gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \
@@ -38,7 +37,7 @@ 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-bootsnap>=1.17.0<1.18:devel/rubygem-bootsnap \
+	rubygem-bootsnap>=1.17.1<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 \
@@ -87,11 +86,11 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-gpgme>=2.0.23<2.1.0:security/rubygem-gpgme \
 	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-grape17>=1.7.0<1.8:devel/rubygem-grape17 \
+	rubygem-grape>=2.0.0<2.1:devel/rubygem-grape \
 	rubygem-grape-entity>=0.10.0<0.11.0,1:devel/rubygem-grape-entity \
-	rubygem-grape-swagger16>=1.6.1<1.7:devel/rubygem-grape-swagger16 \
+	rubygem-grape-swagger>=2.0.1<2.1:devel/rubygem-grape-swagger \
 	rubygem-grape-swagger-entity>=0.5.1<0.6:devel/rubygem-grape-swagger-entity \
-	rubygem-grape-path-helpers>=1.7.1<1.8:devel/rubygem-grape-path-helpers \
+	rubygem-grape-path-helpers>=2.0.0<2.1:devel/rubygem-grape-path-helpers \
 	rubygem-rack-cors>=2.0.1<2.1:www/rubygem-rack-cors \
 	rubygem-graphql>=2.0.27<2.1:devel/rubygem-graphql \
 	rubygem-graphql-docs>=4.0.0<4.1.0:devel/rubygem-graphql-docs \
@@ -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.190.0<4:devel/rubygem-aws-sdk-core \
+	rubygem-aws-sdk-core>=3.190<4:devel/rubygem-aws-sdk-core \
 	rubygem-aws-sdk-cloudformation>=1<2:devel/rubygem-aws-sdk-cloudformation \
-	rubygem-aws-sdk-s3>=1.141.0<2:devel/rubygem-aws-sdk-s3 \
+	rubygem-aws-sdk-s3>=1.142.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,7 +145,8 @@ 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.5<2:textproc/rubygem-nokogiri \
+	rubygem-nokogiri>=1.16<2:textproc/rubygem-nokogiri \
+	rubygem-gitlab-glfm-markdown>=0.0.10<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,3<2.3,3:www/rubygem-rack22 \
@@ -155,21 +155,21 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-sd_notify>=0.1.1<0.2:devel/rubygem-sd_notify \
 	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-sidekiq71>=7.1.6<7.2:devel/rubygem-sidekiq71 \
 	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.5.0<2.6:devel/rubygem-re2 \
+	rubygem-re2>=2.6.0<2.6.1: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-redis-actionpack-rails70>=5.4.0<5.5:databases/rubygem-redis-actionpack-rails70 \
 	rubygem-discordrb-webhooks>=3.4<4.0:net-im/rubygem-discordrb-webhooks \
 	rubygem-jira-ruby21>=2.1.4<2.2:devel/rubygem-jira-ruby21 \
 	rubygem-atlassian-jwt>=0.2.0<0.3.0:www/rubygem-atlassian-jwt \
@@ -204,7 +204,7 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	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-gitlab-labkit>=0.35.0<0.36: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 \
@@ -236,7 +236,7 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	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.1<4:devel/rubygem-google-protobuf \
+	rubygem-google-protobuf>=3.25.2<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 \
@@ -274,7 +274,8 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	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
+	rubygem-google-cloud-profiler-v2>=0.3<1:textproc/rubygem-google-cloud-profiler-v2 \
+	rubygem-parallel>=1.22<2:sysutils/rubygem-parallel
 
 BUILD_DEPENDS=	gem:devel/ruby-gems \
 	${MY_DEPENDS}
@@ -316,6 +317,7 @@ SHEBANG_FILES=	scripts/build_qa_image \
 		scripts/frontend/execute-on-staged-files.sh \
 		scripts/frontend/start_storybook.sh \
 		scripts/partitioning/generate-fk \
+		scripts/validate-monorepo-gem \
 		.lefthook/pre-push/merge_conflicts \
 		qa/gdk/entrypoint \
 		qa/bin/test

www/gitlab-ce/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1707410021
-SHA256 (gitlab-foss-v16.7.5.tar.bz2) = e923a0ad4d9efcbc836d65a5ab69d12b0737ff5d6c4c047188f844788ad465e0
-SIZE (gitlab-foss-v16.7.5.tar.bz2) = 99352795
+TIMESTAMP = 1705828549
+SHA256 (gitlab-foss-v16.8.0.tar.bz2) = 6d90540e97b73f6e6953ef2aa9aa6ce846837efd2879dc2fbaf7640ca942f52d
+SIZE (gitlab-foss-v16.8.0.tar.bz2) = 100003151