www/gitlab-ce: major upgrade to 16.3.0

Make sure you install this version as it will be required for all
further upgrades:
https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/update/index.md#upgrade-paths

Changelog:
https://about.gitlab.com/releases/2023/07/22/gitlab-16-2-released/
https://about.gitlab.com/releases/2023/08/22/gitlab-16-3-released/

7 files changed, 101 insertions, 98 deletions

diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index 8620edf12f28..0bb965a87d29 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitlab-ce
-PORTVERSION=	16.1.5
+PORTVERSION=	16.3.0
 DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	www devel
@@ -18,13 +18,13 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 # 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
-MY_DEPENDS=	git>=2.39.2:devel/git \
+MY_DEPENDS=	git>=2.41.0:devel/git \
 	gitaly>=${PORTVERSION}:devel/gitaly \
-	gitlab-elasticsearch-indexer>=4.3.5:textproc/gitlab-elasticsearch-indexer \
-	gitlab-agent>=16.1.3:net/gitlab-agent \
+	gitlab-elasticsearch-indexer>=4.3.8:textproc/gitlab-elasticsearch-indexer \
+	gitlab-agent>=16.3.0:net/gitlab-agent \
 	gitlab-metrics-exporter>0:devel/gitlab-metrics-exporter \
 	gitlab-pages>=${PORTVERSION}:www/gitlab-pages \
-	gitlab-shell>=14.23.0:devel/gitlab-shell \
+	gitlab-shell>=14.26.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} \
@@ -33,23 +33,23 @@ MY_DEPENDS=	git>=2.39.2:devel/git \
 	rubygem-net-smtp>=0:mail/rubygem-net-smtp \
 	rubygem-net-pop>=0:mail/rubygem-net-pop \
 	rubygem-psych3>=3.1<4:textproc/rubygem-psych3 \
-	rubygem-rails61>=6.1.7.2<6.1.8:www/rubygem-rails61 \
+	rubygem-rails70>=7.0.6<7.1:www/rubygem-rails70 \
 	rubygem-bootsnap>=1.16.0<1.17:devel/rubygem-bootsnap \
 	rubygem-openssl>=3.0<4:security/rubygem-openssl \
 	rubygem-ipaddr>=1.2.5<1.3:net/rubygem-ipaddr \
-	rubygem-responders-rails61>=3.0<4.0:www/rubygem-responders-rails61 \
+	rubygem-responders-rails70>=3.0<4.0:www/rubygem-responders-rails70 \
 	rubygem-sprockets3>=3.7<3.8:devel/rubygem-sprockets3 \
-	rubygem-view_component-rails61>=3.2.0<3.3:devel/rubygem-view_component-rails61 \
+	rubygem-view_component-rails70>=3.2.0<3.3:devel/rubygem-view_component-rails70 \
 	rubygem-pg>=1.5.3<1.6:databases/rubygem-pg \
 	rubygem-neighbor>=0.2.3<0.3:databases/rubygem-neighbor \
-	rubygem-rugged>=1.5<2:devel/rubygem-rugged \
+	rubygem-rugged>=1.6<2:devel/rubygem-rugged \
 	rubygem-grape-path-helpers>=1.7.1<1.8:devel/rubygem-grape-path-helpers \
 	rubygem-faraday1>=1.10.0<3:www/rubygem-faraday1 \
 	rubygem-marginalia>=1.11.1<1.12:databases/rubygem-marginalia \
 	rubygem-declarative_policy>=1.1.0<1.2:security/rubygem-declarative_policy \
-	rubygem-devise-rails61>=4.8.1<4.9:devel/rubygem-devise-rails61 \
+	rubygem-devise48-rails70>=4.8.1<4.9:devel/rubygem-devise48-rails70 \
 	rubygem-bcrypt>=3.1.14<3.2:security/rubygem-bcrypt \
-	rubygem-doorkeeper>=5.6.6<6:security/rubygem-doorkeeper \
+	rubygem-doorkeeper-rails70>=5.6.6<6:security/rubygem-doorkeeper-rails70 \
 	rubygem-doorkeeper-openid_connect>=1.8.7<2:security/rubygem-doorkeeper-openid_connect \
 	rubygem-rexml>=3.2.5<3.3:textproc/rubygem-rexml \
 	rubygem-ruby-saml>=1.15.0<1.16:security/rubygem-ruby-saml \
@@ -74,7 +74,7 @@ MY_DEPENDS=	git>=2.39.2:devel/git \
 	rubygem-recaptcha>=5.12<6.0:devel/rubygem-recaptcha \
 	rubygem-akismet>=3.0<4.0:devel/rubygem-akismet \
 	rubygem-invisible_captcha>=2.0.0<2.1.0:graphics/rubygem-invisible_captcha \
-	rubygem-devise-two-factor-rails61>=4.0.2<4.1:security/rubygem-devise-two-factor-rails61 \
+	rubygem-devise-two-factor40-rails70>=4.0.2<4.1:security/rubygem-devise-two-factor40-rails70 \
 	rubygem-rqrcode-rails3>=0.1.7<0.2.0:www/rubygem-rqrcode-rails3 \
 	rubygem-validates_hostname>=1.0.11<1.1.0:dns/rubygem-validates_hostname \
 	rubygem-rubyzip>=2.3.2<2.4:archivers/rubygem-rubyzip \
@@ -83,7 +83,7 @@ MY_DEPENDS=	git>=2.39.2:devel/git \
 	rubygem-ohai17>=17.9<18:sysutils/rubygem-ohai17 \
 	rubygem-gpgme>=2.0.22<2.1.0:security/rubygem-gpgme \
 	rubygem-gitlab_omniauth-ldap>=2.2.0<2.3.0:net/rubygem-gitlab_omniauth-ldap \
-	rubygem-net-ldap>=0.18.0<0.19:net/rubygem-net-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-entity>=0.10.0<0.11.0,1:devel/rubygem-grape-entity \
 	rubygem-rack-cors>=1.1.1<1.2.0:www/rubygem-rack-cors \
@@ -94,8 +94,9 @@ MY_DEPENDS=	git>=2.39.2:devel/git \
 	rubygem-apollo_upload_server>=2.1.0<2.2:net/rubygem-apollo_upload_server \
 	rubygem-graphql-docs>=2.1.0<2.2.0:devel/rubygem-graphql-docs \
 	rubygem-graphlient>=0.5.0<0.6:devel/rubygem-graphlient \
+	rubygem-ffaker>=2.10<3:devel/rubygem-ffaker \
 	rubygem-hashie>=5.0.0<5.1:devel/rubygem-hashie \
-	rubygem-kaminari-rails61>=1.2.2<1.3:www/rubygem-kaminari-rails61 \
+	rubygem-kaminari-rails70>=1.2.2<1.3:www/rubygem-kaminari-rails70 \
 	rubygem-hamlit>=2.15.0<2.16:www/rubygem-hamlit \
 	rubygem-carrierwave>=1.3.2<2.0:www/rubygem-carrierwave \
 	rubygem-mini_magick410>=4.10.1<4.11:graphics/rubygem-mini_magick410 \
@@ -104,7 +105,7 @@ MY_DEPENDS=	git>=2.39.2:devel/git \
 	rubygem-fog-google>=1.19<2: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.7.0<1.8:net/rubygem-gitlab-fog-azure-rm \
+	rubygem-gitlab-fog-azure-rm>=1.8.0<1.9:net/rubygem-gitlab-fog-azure-rm \
 	rubygem-google-cloud-storage>=1.44.0<1.45:net/rubygem-google-cloud-storage \
 	rubygem-google-apis-core>=0.10.0<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 \
@@ -121,15 +122,15 @@ MY_DEPENDS=	git>=2.39.2: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-core3175>=3.175.0<3.176:devel/rubygem-aws-sdk-core3175 \
+	rubygem-aws-sdk-core>=3.180.3<4:devel/rubygem-aws-sdk-core \
 	rubygem-aws-sdk-cloudformation>=1<2:devel/rubygem-aws-sdk-cloudformation \
-	rubygem-aws-sdk-s31126>=1.126.0<1.127:devel/rubygem-aws-sdk-s31126 \
+	rubygem-aws-sdk-s3>=1.132.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 \
 	rubygem-deckar01-task_list>=2.3.2<2.4:www/rubygem-deckar01-task_list \
 	rubygem-gitlab-markup>=1.9.0<1.10.0:textproc/rubygem-gitlab-markup \
-	rubygem-commonmarker>=0.23.10<0.24:textproc/rubygem-commonmarker \
+	rubygem-commonmarker>=0.23.9<0.24:textproc/rubygem-commonmarker \
 	rubygem-kramdown23>=2.3.1<2.4:textproc/rubygem-kramdown23 \
 	rubygem-redcloth>=4.3.2<4.4.0:www/rubygem-redcloth \
 	rubygem-rdoc63>=6.3.2<7:devel/rubygem-rdoc63 \
@@ -140,13 +141,13 @@ MY_DEPENDS=	git>=2.39.2:devel/git \
 	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.8.0<0.9:textproc/rubygem-asciidoctor-kroki \
-	rubygem-rouge>=4.1.2<4.2:textproc/rubygem-rouge \
+	rubygem-rouge>=4.1.3<4.2:textproc/rubygem-rouge \
 	rubygem-truncato>=0.7.11<0.8.0:textproc/rubygem-truncato \
-	rubygem-nokogiri>=1.15.2<2:textproc/rubygem-nokogiri \
+	rubygem-nokogiri>=1.15.4<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.7,3<2.3,3:www/rubygem-rack22 \
+	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.3<7:www/rubygem-puma \
 	rubygem-sd_notify>=0.1.1<0.2:devel/rubygem-sd_notify \
@@ -159,14 +160,14 @@ MY_DEPENDS=	git>=2.39.2:devel/git \
 	rubygem-httparty020>=0.20.0<0.21:www/rubygem-httparty020 \
 	rubygem-rainbow>=3.1.1<4.0:devel/rubygem-rainbow \
 	rubygem-ruby-progressbar>=1.11<2:devel/rubygem-ruby-progressbar \
-	rubygem-re2>=1.6.0<1.7.0:devel/rubygem-re2 \
+	rubygem-re2>=1.7.0<1.8.0:devel/rubygem-re2 \
 	rubygem-semver_dialects>=1.2.1<1.3: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-connection_pool>=2.2.5<3.0:net/rubygem-connection_pool \
-	rubygem-redis-actionpack-rails61>=5.3.0<5.4:databases/rubygem-redis-actionpack-rails61 \
+	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 \
 	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 \
@@ -187,37 +188,38 @@ MY_DEPENDS=	git>=2.39.2:devel/git \
 	rubygem-gitlab-chronic>=0.10.5<0.11.0:devel/rubygem-gitlab-chronic \
 	rubygem-gitlab_chronic_duration>=0.10.6.2<0.10.7:devel/rubygem-gitlab_chronic_duration \
 	rubygem-rack-proxy>=0.7.6<0.8.0:www/rubygem-rack-proxy \
-	rubygem-sassc-rails-rails61>=2.1.0<2.2.0:textproc/rubygem-sassc-rails-rails61 \
+	rubygem-sassc-rails-rails70>=2.1.0<2.2.0:textproc/rubygem-sassc-rails-rails70 \
 	rubygem-autoprefixer-rails1025>=10.2.5.1<10.2.6:textproc/rubygem-autoprefixer-rails1025 \
 	rubygem-terser>=1.0.2:textproc/rubygem-terser \
 	rubygem-addressable>=2.8<3:www/rubygem-addressable \
 	rubygem-tanuki_emoji>=0.6<1:graphics/rubygem-tanuki_emoji \
-	rubygem-gon-rails61>=6.4.0<6.5:www/rubygem-gon-rails61 \
+	rubygem-gon-rails70>=6.4.0<6.5:www/rubygem-gon-rails70 \
 	rubygem-request_store>=1.5.1<2.0:devel/rubygem-request_store \
 	rubygem-base32>=0.3.0<0.4.0:converters/rubygem-base32 \
 	rubygem-gitlab-license>=2.3<3:devel/rubygem-gitlab-license \
-	rubygem-rack-attack>=6.6.1<6.7:www/rubygem-rack-attack \
+	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-pg_query>=4.2.1<4.3:databases/rubygem-pg_query \
-	rubygem-premailer-rails-rails61>=1.10.3<1.11:mail/rubygem-premailer-rails-rails61 \
-	rubygem-gitlab-labkit>=0.33.0<0.34:devel/rubygem-gitlab-labkit \
+	rubygem-pg_query>=4.2.3<4.3:databases/rubygem-pg_query \
+	rubygem-premailer-rails-rails70>=1.10.3<1.11:mail/rubygem-premailer-rails-rails70 \
+	rubygem-gitlab-labkit>=0.34.0<0.35:devel/rubygem-gitlab-labkit \
 	rubygem-thrift>=0.16.0:devel/rubygem-thrift \
 	rubygem-ruby_parser>=3.20<4.0:devel/rubygem-ruby_parser \
-	rubygem-rails-i18n-rails61>=7.0<8:devel/rubygem-rails-i18n-rails61 \
-	rubygem-gettext_i18n_rails18>=1.8.0<1.9.0:devel/rubygem-gettext_i18n_rails18 \
-	rubygem-gettext_i18n_rails_js-rails61>=1.3<2.0:devel/rubygem-gettext_i18n_rails_js-rails61 \
+	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>=1.3<2.0: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-rails61>=1.1.0<2.0:devel/rubygem-peek-rails61 \
+	rubygem-peek-rails70>=1.1.0<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.25<0.26:devel/rubygem-prometheus-client-mmap \
+	rubygem-prometheus-client-mmap>=0.27<0.28:devel/rubygem-prometheus-client-mmap \
 	rubygem-warning>=1.3.0<1.4:devel/rubygem-warning \
 	rubygem-license_finder>=7.0.0<8:devel/rubygem-license_finder \
-	rubygem-gitlab-dangerfiles>=3.10.0<3.11:devel/rubygem-gitlab-dangerfiles \
+	rubygem-gitlab-dangerfiles>=3.13.0<3.14:devel/rubygem-gitlab-dangerfiles \
+	rubygem-rspec>=3.0<4:devel/rubygem-rspec \
 	rubygem-octokit5>=4.20<6.0:net/rubygem-octokit5 \
 	rubygem-gitlab-mail_room>=0.0.23<0.1.0:mail/rubygem-gitlab-mail_room \
 	rubygem-email_reply_trimmer>=0.1<1.0:mail/rubygem-email_reply_trimmer \
@@ -228,23 +230,23 @@ MY_DEPENDS=	git>=2.39.2:devel/git \
 	rubygem-benchmark-memory>=0.1<1.0:benchmarks/rubygem-benchmark-memory \
 	rubygem-activerecord-explain-analyze>=0.1<1.0:databases/rubygem-activerecord-explain-analyze \
 	rubygem-oauth2>=2.0<3:net/rubygem-oauth2 \
-	rubygem-health_check>=3.0<4:devel/rubygem-health_check \
+	rubygem-health_check-rails70>=3.0<4:devel/rubygem-health_check-rails70 \
 	rubygem-vmstat>=2.3.0<2.4.0:sysutils/rubygem-vmstat \
 	rubygem-sys-filesystem>=1.4.3<1.5:sysutils/rubygem-sys-filesystem \
 	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.1.0.pre.rc2<16.2.0:net/rubygem-gitaly \
-	rubygem-kas-grpc>=0.1.0,1<0.2.0,1:net/rubygem-kas-grpc \
-	rubygem-grpc>=1.42.0<2:net/rubygem-grpc \
-	rubygem-google-protobuf323>=3.23.3<4:devel/rubygem-google-protobuf323 \
+	rubygem-gitaly>=16.2.0.pre.rc4<16.3.0:net/rubygem-gitaly \
+	rubygem-kas-grpc>=0.2.0,1<0.3.0,1:net/rubygem-kas-grpc \
+	rubygem-grpc>=1.55.0<2:net/rubygem-grpc \
+	rubygem-google-protobuf323>=3.23.4<4:devel/rubygem-google-protobuf323 \
 	rubygem-toml-rb>=2.2.0<3:www/rubygem-toml-rb \
 	rubygem-flipper025>=0.25.0<0.26:devel/rubygem-flipper025 \
-	rubygem-flipper-active_record-rails61>=0.25.0<0.26:databases/rubygem-flipper-active_record-rails61 \
-	rubygem-flipper-active_support_cache_store-rails61>=0.25.0<0.26:devel/rubygem-flipper-active_support_cache_store-rails61 \
+	rubygem-flipper-active_record-rails70>=0.25.0<0.26:databases/rubygem-flipper-active_record-rails70 \
+	rubygem-flipper-active_support_cache_store-rails70>=0.25.0<0.26:devel/rubygem-flipper-active_support_cache_store-rails70 \
 	rubygem-unleash>=3.2.2<3.3:devel/rubygem-unleash \
 	rubygem-gitlab-experiment>=0.7.0<0.8:devel/rubygem-gitlab-experiment \
-	rubygem-lograge-rails61>=0.11.2<1.0:www/rubygem-lograge-rails61 \
+	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 \
 	rubygem-countries>=4.1.3<4.2.0:devel/rubygem-countries \
@@ -253,6 +255,7 @@ MY_DEPENDS=	git>=2.39.2:devel/git \
 	rubygem-mail>=2.8.1<2.8.2,2:mail/rubygem-mail \
 	rubygem-lockbox>=1.1.1<1.2:security/rubygem-lockbox \
 	rubygem-valid_email>=0.1<1:mail/rubygem-valid_email \
+	rubygem-jsonb_accessor>=1.3.10<1.4:www/rubygem-jsonb_accessor \
 	rubygem-json>=2.6.3<3:devel/rubygem-json \
 	rubygem-json_schemer>=0.2.18<0.3:devel/rubygem-json_schemer \
 	rubygem-oj313>=3.13.21<3.14:devel/rubygem-oj313 \
@@ -266,7 +269,7 @@ MY_DEPENDS=	git>=2.39.2:devel/git \
 	rubygem-parser>=0:devel/rubygem-parser \
 	rubygem-cvss-suite>=3.0.1<3.1:security/rubygem-cvss-suite \
 	rubygem-arr-pm>=0.0.12<0.1:devel/rubygem-arr-pm \
-	rubygem-devfile>=0.0.19.p.a1<0.0.20:net/rubygem-devfile \
+	rubygem-devfile>=0.0.22.p.a1<0.0.23:net/rubygem-devfile \
 	rubygem-CFPropertyList>=3.0.0<3.1:devel/rubygem-CFPropertyList \
 	rubygem-app_store_connect>=0:net/rubygem-app_store_connect \
 	rubygem-telesignenterprise>=2.2<3:devel/rubygem-telesignenterprise \
@@ -424,6 +427,7 @@ post-install:
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts/tmp/cache" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/artifacts/tmp/uploads" >> ${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}
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index 7b1f1d93ad5f..cf79be8964f9 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1693546640
-SHA256 (gitlab-foss-v16.1.5.tar.bz2) = 47f8e4310ea350a150636913b7df231241054b8ee18b00ab9706f9cf734c9be5
-SIZE (gitlab-foss-v16.1.5.tar.bz2) = 89403215
+TIMESTAMP = 1693593930
+SHA256 (gitlab-foss-v16.3.0.tar.bz2) = 0cb32ff6dfac350ca9af395807d9771859326efc5928e5a4b8388ede91078023
+SIZE (gitlab-foss-v16.3.0.tar.bz2) = 91373809
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index b236a717a939..2ae8a42038e2 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -1,7 +1,7 @@
---- Gemfile.orig	2023-07-04 20:45:49 UTC
+--- Gemfile.orig	2023-08-21 09:25:45 UTC
 +++ Gemfile
-@@ -35,7 +35,7 @@ gem 'neighbor', '~> 0.2.3'
- gem 'rugged', '~> 1.5'
+@@ -46,7 +46,7 @@ gem 'neighbor', '~> 0.2.3'
+ gem 'rugged', '~> 1.6'
  gem 'grape-path-helpers', '~> 1.7.1'
  
 -gem 'faraday', '~> 1.0'
@@ -9,7 +9,7 @@
  gem 'marginalia', '~> 1.11.1'
  
  # Authorization
-@@ -55,8 +55,8 @@ gem 'omniauth-azure-activedirectory-v2', '~> 2.0'
+@@ -66,8 +66,8 @@ gem 'omniauth-azure-activedirectory-v2', '~> 2.0'
  gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md
  gem 'omniauth-dingtalk-oauth2', '~> 1.0'
  gem 'omniauth-alicloud', '~> 2.0.1'
@@ -20,7 +20,7 @@
  gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md
  gem 'omniauth-google-oauth2', '~> 1.1'
  gem 'omniauth-oauth2-generic', '~> 0.2.2'
-@@ -67,7 +67,7 @@ gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/o
+@@ -78,7 +78,7 @@ gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/o
  gem 'omniauth_openid_connect', '~> 0.6.1'
  # 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 +29,7 @@
  gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md
  gem 'omniauth-atlassian-oauth2', '~> 0.2.0'
  gem 'rack-oauth2', '~> 1.21.3'
-@@ -152,7 +152,7 @@ gem 'gitlab-fog-azure-rm', '~> 1.7.0', require: 'fog/a
+@@ -166,7 +166,7 @@ gem 'gitlab-fog-azure-rm', '~> 1.8.0', require: 'fog/a
  
  # for Google storage
  gem 'google-cloud-storage', '~> 1.44.0'
@@ -38,16 +38,19 @@
  gem 'google-apis-compute_v1', '~> 0.57.0'
  gem 'google-apis-container_v1', '~> 0.43.0'
  gem 'google-apis-container_v1beta1', '~> 0.43.0'
-@@ -173,7 +173,7 @@ gem 'seed-fu', '~> 2.3.7'
+@@ -187,9 +187,9 @@ gem 'seed-fu', '~> 2.3.7'
  gem 'elasticsearch-model', '~> 7.2'
  gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation'
  gem 'elasticsearch-api',   '7.13.3'
--gem 'aws-sdk-core', '~> 3.175.0'
-+gem 'aws-sdk-core', '~> 3.175'
+-gem 'aws-sdk-core', '~> 3.180.3'
++gem 'aws-sdk-core', '~> 3.180'
  gem 'aws-sdk-cloudformation', '~> 1'
- gem 'aws-sdk-s3', '~> 1.126.0'
+-gem 'aws-sdk-s3', '~> 1.132.1'
++gem 'aws-sdk-s3', '~> 1.132'
  gem 'faraday_middleware-aws-sigv4', '~>0.3.0'
-@@ -274,7 +274,7 @@ gem 'slack-messenger', '~> 2.3.4'
+ gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections
+ 
+@@ -289,7 +289,7 @@ gem 'slack-messenger', '~> 2.3.4'
  gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat'
  
  # Asana integration
@@ -56,12 +59,12 @@
  
  # FogBugz integration
  gem 'ruby-fogbugz', '~> 0.3.0'
-@@ -367,118 +367,17 @@ gem 'prometheus-client-mmap', '~> 0.25', require: 'pro
+@@ -385,78 +385,10 @@ gem 'prometheus-client-mmap', '~> 0.27', require: 'pro
  
  gem 'warning', '~> 1.3.0'
  
 -group :development do
--  gem 'lefthook', '~> 1.4.2', require: false
+-  gem 'lefthook', '~> 1.4.7', require: false
 -  gem 'rubocop'
 -  gem 'solargraph', '~> 0.47.2', require: false
 -
@@ -82,24 +85,21 @@
 -  gem 'parser', '~> 3.2', '>= 3.2.2.3'
 -  gem 'pry-byebug'
 -  gem 'pry-rails', '~> 0.3.9'
--  gem 'pry-shell', '~> 0.6.1'
+-  gem 'pry-shell', '~> 0.6.4'
 -
 -  gem 'awesome_print', require: false
 -
 -  gem 'database_cleaner', '~> 1.7.0'
 -  gem 'factory_bot_rails', '~> 6.2.0'
--  gem 'rspec-rails', '~> 6.0.1'
+-  gem 'rspec-rails', '~> 6.0.3'
 -
 -  # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
 -  gem 'minitest', '~> 5.11.0'
 -
--  # Generate Fake data
--  gem 'ffaker', '~> 2.10'
--
 -  gem 'spring', '~> 4.1.0'
 -  gem 'spring-commands-rspec', '~> 1.0.4'
 -
--  gem 'gitlab-styles', '~> 10.0.0', require: false
+-  gem 'gitlab-styles', '~> 10.1.0', require: false
 -
 -  gem 'haml_lint', '~> 0.40.0', require: false
 -  gem 'bundler-audit', '~> 0.7.0.1', require: false
@@ -125,19 +125,21 @@
 -end
 -
  group :development, :test, :danger do
-   gem 'gitlab-dangerfiles', '~> 3.10.0', require: false
+   gem 'gitlab-dangerfiles', '~> 3.13.0', require: false
  end
  
 -group :development, :test, :coverage do
 -  gem 'simplecov', '~> 0.21', require: false
 -  gem 'simplecov-lcov', '~> 0.8.0', require: false
--  gem 'simplecov-cobertura', '~> 1.3.1', require: false
+-  gem 'simplecov-cobertura', '~> 2.1.0', require: false
 -  gem 'undercover', '~> 0.4.4', require: false
 -end
 -
  # Gems required in omnibus-gitlab pipeline
  group :development, :test, :omnibus do
    gem 'license_finder', '~> 7.0', require: false
+@@ -468,37 +400,8 @@ group :development, :test, :monorepo do
+   gem 'rspec_flaky', path: 'gems/rspec_flaky'
  end
  
 -group :test do
@@ -148,10 +150,9 @@
 -  gem 'rspec-parameterized', '~> 1.0', require: false
 +gem 'octokit', '>= 4.15'
  
--  gem 'capybara', '~> 3.39', '>= 3.39.1'
+-  gem 'capybara', '~> 3.39', '>= 3.39.2'
 -  gem 'capybara-screenshot', '~> 1.0.26'
--  # 4.9.1 drops Ruby 2.7 support. We can upgrade further after we drop Ruby 2.7 support.
--  gem 'selenium-webdriver', '= 4.9.0'
+-  gem 'selenium-webdriver', '= 4.11.0'
 -
 -  gem 'graphlyte', '~> 1.0.0'
 -
@@ -160,7 +161,7 @@
 -  gem 'webmock', '~> 3.18.1'
 -  gem 'rails-controller-testing'
 -  gem 'concurrent-ruby', '~> 1.1'
--  gem 'test-prof', '~> 1.2.1'
+-  gem 'test-prof', '~> 1.2.2'
 -  gem 'rspec_junit_formatter'
 -  gem 'guard-rspec'
 -  gem 'axe-core-rspec'
@@ -168,7 +169,7 @@
 -  # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
 -  gem 'derailed_benchmarks', require: false
 -
--  gem 'gitlab_quality-test_tooling', '~> 0.8.1', require: false
+-  gem 'gitlab_quality-test_tooling', '~> 0.9.3', require: false
 -end
 -
 -gem 'octokit', '~> 4.15'
@@ -176,14 +177,14 @@
  gem 'gitlab-mail_room', '~> 0.0.23', require: 'mail_room'
  
  gem 'email_reply_trimmer', '~> 0.1'
-@@ -514,14 +413,14 @@ gem 'gitaly', '~> 16.1.0-rc2'
+@@ -534,14 +437,14 @@ gem 'gitaly', '~> 16.2.0-rc4'
  # KAS GRPC protocol definitions
- gem 'kas-grpc', '~> 0.1.0'
+ gem 'kas-grpc', '~> 0.2.0'
  
--gem 'grpc', '~> 1.42.0'
-+gem 'grpc', '~> 1.42'
+-gem 'grpc', '~> 1.55.0'
++gem 'grpc', '~> 1.55'
  
- gem 'google-protobuf', '~> 3.23', '>= 3.23.3'
+ gem 'google-protobuf', '~> 3.23', '>= 3.23.4'
  
  gem 'toml-rb', '~> 2.2.0'
  
@@ -193,7 +194,7 @@
  gem 'flipper-active_record', '~> 0.25.0'
  gem 'flipper-active_support_cache_store', '~> 0.25.0'
  gem 'unleash', '~> 3.2.2'
-@@ -535,7 +434,7 @@ gem 'grape_logging', '~> 1.8'
+@@ -555,7 +458,7 @@ gem 'grape_logging', '~> 1.8'
  gem 'gitlab-net-dns', '~> 0.9.2'
  
  # Countries list
@@ -202,15 +203,13 @@
  
  gem 'retriable', '~> 3.1.2'
  
-@@ -582,6 +481,11 @@ gem 'ed25519', '~> 1.3.0'
- # Error Tracking OpenAPI client
- # See https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/rake_tasks.md#update-openapi-client-for-error-tracking-feature
- gem 'error_tracking_open_api', path: 'vendor/gems/error_tracking_open_api'
+@@ -628,3 +531,9 @@ gem 'net-protocol', '~> 0.1.3'
+ gem 'net-http', '= 0.1.1'
+ 
+ gem 'duo_api', '~> 1.3'
 +
 +gem 'parser'
 +gem 'net-smtp'
 +gem 'net-pop'
 +gem 'psych', '~> 3.1'
- 
- # Vulnerability advisories
- gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite'
++
diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example
index 657c39b445da..137e75172c6f 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-05-22 18:44:12 UTC
+--- config/gitlab.yml.example.orig	2023-08-21 09:25:45 UTC
 +++ config/gitlab.yml.example
 @@ -456,7 +456,7 @@ production: &base
    ## GitLab Pages
@@ -72,7 +72,7 @@
  
      # The URL to the external KAS API (used by the Kubernetes agents)
      # external_url: wss://kas.example.com
-@@ -1278,13 +1278,13 @@ production: &base
+@@ -1284,13 +1284,13 @@ production: &base
  
    ## GitLab Elasticsearch settings
    elasticsearch:
@@ -88,7 +88,7 @@
  
    ## Webpack settings
    # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
-@@ -1305,18 +1305,18 @@ production: &base
+@@ -1311,18 +1311,18 @@ production: &base
  
      # Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq.
      sidekiq_exporter:
@@ -114,7 +114,7 @@
  
      # Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma.
      web_exporter:
-@@ -1541,13 +1541,13 @@ test:
+@@ -1547,13 +1547,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 7ca164324ac2..7e2b60894f18 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.1-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/16.3-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.0-16.1-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/16.1-16.3-freebsd.md
 
 If you just installed an minor upgrade of GitLab please follow
 the instructions in the guide at:
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index 0c2a38aae5ab..2f71bf86ef85 100644
--- a/www/gitlab-workhorse/Makefile
+++ b/www/gitlab-workhorse/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitlab-workhorse
-PORTVERSION=	16.1.5
+PORTVERSION=	16.3.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index 3622193c0abb..699825c44732 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1693546700
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.1.5/go.mod) = 4309afa8da6b6339fe3340745f84acb26f526e9d45610f8cc6a2fefd6163a71b
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.1.5/go.mod) = 6331
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.1.5/gitlab-foss-v16.1.5.tar.bz2) = 47f8e4310ea350a150636913b7df231241054b8ee18b00ab9706f9cf734c9be5
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.1.5/gitlab-foss-v16.1.5.tar.bz2) = 89403215
+TIMESTAMP = 1693577972
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.3.0/go.mod) = 72d012b5c2c9d6d7f18273a2b347976bc6aa2619349419b7360a7b75d5247fef
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.3.0/go.mod) = 6561
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.3.0/gitlab-foss-v16.3.0.tar.bz2) = 0cb32ff6dfac350ca9af395807d9771859326efc5928e5a4b8388ede91078023
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.3.0/gitlab-foss-v16.3.0.tar.bz2) = 91373809