7 files changed, 59 insertions, 70 deletions

diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index 86846147d233..88eb355c596c 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -31,38 +31,37 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	gitlab-elasticsearch-indexer>=5.13.3:textproc/gitlab-elasticsearch-indexer \
 	gitlab-agent>=${GITLAB_VERSION}:net/gitlab-agent \
 	gitlab-pages>=${GITLAB_VERSION}:www/gitlab-pages \
-	gitlab-shell>=14.47.0:devel/gitlab-shell \
+	gitlab-shell>=14.49.0:devel/gitlab-shell \
 	gitlab-workhorse>=${GITLAB_VERSION}:www/gitlab-workhorse \
-	gitlab-zoekt-indexer>=1.11.0:textproc/gitlab-zoekt-indexer \
+	gitlab-zoekt-indexer>=1.13.0:textproc/gitlab-zoekt-indexer \
 	redis>=6.2.11:databases/redis \
 	yarn${NODEJS_SUFFIX}>=1.10.0:www/yarn${NODEJS_SUFFIX} \
 	gtar>0:archivers/gtar \
 	bash>0:shells/bash \
-	rubygem-parser>=3.3.10.1:devel/rubygem-parser \
+	rubygem-parser-gitlab>=3.3.11.1:devel/rubygem-parser-gitlab \
 	rubygem-net-smtp>=0:mail/rubygem-net-smtp \
 	rubygem-psych3>=3.1<4:textproc/rubygem-psych3 \
 	rubygem-net-pop>=0:mail/rubygem-net-pop \
 	rubygem-rails-gitlab>=${RAILS_VERSION}<7.3:www/rubygem-rails-gitlab \
 	rubygem-zeitwerk>=2.6.18<2.6.19:devel/rubygem-zeitwerk \
 	rubygem-drb-gitlab>=2.2.3<3:devel/rubygem-drb-gitlab \
-	rubygem-bootsnap-gitlab>=1.18.6<1.19:devel/rubygem-bootsnap-gitlab \
+	rubygem-bootsnap-gitlab>=1.23.0<1.24:devel/rubygem-bootsnap-gitlab \
 	rubygem-ffi>=1.17.3<2:devel/rubygem-ffi \
 	rubygem-openssl3>=3.3.2<3.4:security/rubygem-openssl3 \
-	rubygem-gitlab-secret_detection>=0.39.3<1:security/rubygem-gitlab-secret_detection \
+	rubygem-gitlab-secret_detection>=0.40.0<1:security/rubygem-gitlab-secret_detection \
 	rubygem-responders-rails-gitlab>=3.0<4.0:www/rubygem-responders-rails-gitlab \
 	rubygem-sprockets-gitlab>=3.7.5<3.8:devel/rubygem-sprockets-gitlab \
 	rubygem-sprockets-rails-rails-gitlab>=3.5.2<3.6:devel/rubygem-sprockets-rails-rails-gitlab \
 	rubygem-view_component-rails-gitlab>=3.23.2<3.24:devel/rubygem-view_component-rails-gitlab \
 	rubygem-pg-gitlab>=1.6.3<1.7:databases/rubygem-pg-gitlab \
-	rubygem-rugged>=1.9<2:devel/rubygem-rugged \
 	rubygem-faraday-gitlab>=2.13.4<3:www/rubygem-faraday-gitlab \
 	rubygem-faraday-retry-gitlab>=2<3:www/rubygem-faraday-retry-gitlab \
 	rubygem-logger-gitlab>=1.7.0<1.8:devel/rubygem-logger-gitlab \
 	rubygem-marginalia>=1.11.1<1.12:databases/rubygem-marginalia \
 	rubygem-declarative_policy>=2.1.0<2.2:security/rubygem-declarative_policy \
-	rubygem-coverband>=6.1.7<6.2:www/rubygem-coverband \
+	rubygem-coverband>=6.2.0<6.3:www/rubygem-coverband \
 	rubygem-devise-rails-gitlab>=4.9.3<4.10:devel/rubygem-devise-rails-gitlab \
-	rubygem-bcrypt>=3.1.21<3.2:security/rubygem-bcrypt \
+	rubygem-bcrypt>=3.1.22<3.2:security/rubygem-bcrypt \
 	rubygem-doorkeeper-rails-gitlab>=5.8.1<6:security/rubygem-doorkeeper-rails-gitlab \
 	rubygem-doorkeeper-openid_connect>=1.8.11<2:security/rubygem-doorkeeper-openid_connect \
 	rubygem-doorkeeper-device_authorization_grant>=1.0.0<1.1:security/rubygem-doorkeeper-device_authorization_grant \
@@ -74,7 +73,7 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-omniauth-azure-activedirectory-v2>=2.0<3:net/rubygem-omniauth-azure-activedirectory-v2 \
 	rubygem-omniauth-alicloud>=3.0.0<3.1:security/rubygem-omniauth-alicloud \
 	rubygem-omniauth-github-gitlab>=2.0.1<2.1:net/rubygem-omniauth-github-gitlab \
-	rubygem-omniauth-google-oauth2-gitlab>=1.2.1<2:net/rubygem-omniauth-google-oauth2-gitlab \
+	rubygem-omniauth-google-oauth2-gitlab>=1.2.2<2:net/rubygem-omniauth-google-oauth2-gitlab \
 	rubygem-omniauth-oauth2-generic-gitlab>=0.2.2<0.3.0:security/rubygem-omniauth-oauth2-generic-gitlab \
 	rubygem-omniauth-shibboleth-redux-gitlab>=2.0<3:security/rubygem-omniauth-shibboleth-redux-gitlab \
 	rubygem-omniauth_openid_connect>=0.8.0<0.9:net/rubygem-omniauth_openid_connect \
@@ -92,9 +91,9 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-attr_encrypted>=4.2<5:security/rubygem-attr_encrypted \
 	rubygem-validates_hostname-gitlab>=1.0.13<1.1.0:dns/rubygem-validates_hostname-gitlab \
 	rubygem-rubyzip-gitlab>=2.4.1<2.5:archivers/rubygem-rubyzip-gitlab \
-	rubygem-acme-client-gitlab>=2.0.30<3:security/rubygem-acme-client-gitlab \
+	rubygem-acme-client-gitlab>=2.0.31<3:security/rubygem-acme-client-gitlab \
 	rubygem-browser5>=5.3.1<5.4:www/rubygem-browser5 \
-	rubygem-ohai>=19.1.6<19.2:sysutils/rubygem-ohai \
+	rubygem-ohai>=19.1.24<19.2:sysutils/rubygem-ohai \
 	rubygem-gpgme>=2.0.26<2.1.0:security/rubygem-gpgme \
 	rubygem-gitlab_omniauth-ldap-gitlab>=2.3.0<2.4.0:net/rubygem-gitlab_omniauth-ldap-gitlab \
 	rubygem-net-ldap>=0.20.0<0.21:net/rubygem-net-ldap \
@@ -149,7 +148,7 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-html-pipeline-gitlab>=2.14.3<2.15:textproc/rubygem-html-pipeline-gitlab \
 	rubygem-gitlab-markup>=2.0.0<2.1:textproc/rubygem-gitlab-markup \
 	rubygem-commonmarker0>=0.23.12<0.24:textproc/rubygem-commonmarker0 \
-	rubygem-kramdown-gitlab>=2.5.1<2.6:textproc/rubygem-kramdown-gitlab \
+	rubygem-kramdown-gitlab>=2.5.2<2.6:textproc/rubygem-kramdown-gitlab \
 	rubygem-redcloth>=4.3.3<4.4.0:www/rubygem-redcloth \
 	rubygem-org-ruby>=0.9.12<0.10.0:textproc/rubygem-org-ruby \
 	rubygem-creole>=0.5.0<0.6.0:textproc/rubygem-creole \
@@ -166,7 +165,7 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-unicode-emoji>=4.0.4<5:devel/rubygem-unicode-emoji \
 	rubygem-icalendar-gitlab>=2.10.3<2.11:devel/rubygem-icalendar-gitlab \
 	rubygem-diffy>=3.4.4<4:textproc/rubygem-diffy \
-	rubygem-rack22>=2.2.22,3<2.3,3:www/rubygem-rack22 \
+	rubygem-rack-gitlab>=2.2.23<2.3:www/rubygem-rack-gitlab \
 	rubygem-rack-timeout>=0.7.0<0.8:www/rubygem-rack-timeout \
 	rubygem-puma-gitlab>=7.2<8:www/rubygem-puma-gitlab \
 	rubygem-sd_notify>=0.1.1<0.2:devel/rubygem-sd_notify \
@@ -196,7 +195,7 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-circuitbox>=2.0.0<2.1:www/rubygem-circuitbox \
 	rubygem-sanitize60>=6.0.2<6.1:textproc/rubygem-sanitize60 \
 	rubygem-babosa>=2.0<3:textproc/rubygem-babosa \
-	rubygem-loofah-gitlab>=2.25.0<2.26:textproc/rubygem-loofah-gitlab \
+	rubygem-loofah-gitlab>=2.25.1<2.26:textproc/rubygem-loofah-gitlab \
 	rubygem-licensee-gitlab>=9.16<10:devel/rubygem-licensee-gitlab \
 	rubygem-charlock_holmes>=0.7.9<0.8:textproc/rubygem-charlock_holmes \
 	rubygem-ruby-magic>=0.6<1:devel/rubygem-ruby-magic \
@@ -222,7 +221,7 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-thrift>=0.22.0,1<0.23,1:devel/rubygem-thrift \
 	rubygem-rails-i18n-rails-gitlab>=7.0.9<8:devel/rubygem-rails-i18n-rails-gitlab \
 	rubygem-gettext_i18n_rails>=1.13.0<1.14:devel/rubygem-gettext_i18n_rails \
-	rubygem-gettext>=3.5.1<4:devel/rubygem-gettext \
+	rubygem-gettext>=3.5.2<4:devel/rubygem-gettext \
 	rubygem-batch-loader>=2.0.5<2.1:devel/rubygem-batch-loader \
 	rubygem-tty-prompt>=0.23<1:devel/rubygem-tty-prompt \
 	rubygem-peek-rails-gitlab>=1.1<2.0:devel/rubygem-peek-rails-gitlab \
@@ -230,10 +229,11 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-webrick>=1.9.0<1.10:www/rubygem-webrick \
 	rubygem-prometheus-client-mmap>=1.5.0<1.6:devel/rubygem-prometheus-client-mmap \
 	rubygem-async-gitlab>=2.32.0<2.33:devel/rubygem-async-gitlab \
-	rubygem-io-event>=1.12.1<2:devel/rubygem-io-event \
-	rubygem-gitlab-security_report_schemas>=0.1.3.min15.0.0.max15.2.3<0.1.3.min15.0.0.max15.2.4:devel/rubygem-gitlab-security_report_schemas \
-	rubygem-vite_rails-gitlab>=3.0.17<3.1:devel/rubygem-vite_rails-gitlab \
-	rubygem-vite_ruby-gitlab>=3.9.0<3.10:devel/rubygem-vite_ruby-gitlab \
+	rubygem-io-event-gitlab>=1.14.5<2:devel/rubygem-io-event-gitlab \
+	rubygem-gitlab-security_report_schemas>=0.2.0.min15.0.0.max15.2.4<0.2.0.min15.0.0.max15.2.5:devel/rubygem-gitlab-security_report_schemas \
+	rubygem-vite_rails-gitlab>=3.10.0<3.11:devel/rubygem-vite_rails-gitlab \
+	rubygem-vite_ruby-gitlab>=3.10.1<3.11:devel/rubygem-vite_ruby-gitlab \
+	rubygem-js-routes>=2.3<3:www/rubygem-js-routes \
 	rubygem-opentelemetry-sdk-gitlab>=1.10.0:devel/rubygem-opentelemetry-sdk-gitlab \
 	rubygem-opentelemetry-exporter-otlp-gitlab>=0.31.1:devel/rubygem-opentelemetry-exporter-otlp-gitlab \
 	rubygem-opentelemetry-instrumentation-active_support-gitlab>=0.10.0:devel/rubygem-opentelemetry-instrumentation-active_support-gitlab \
@@ -277,10 +277,10 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-net-ntp>0:net/rubygem-net-ntp \
 	rubygem-ssh_data>=2.0<3:security/rubygem-ssh_data \
 	rubygem-spamcheck>=1.3.3<1.4:net/rubygem-spamcheck \
-	rubygem-gitaly>=18.8.3:net/rubygem-gitaly \
+	rubygem-gitaly>=18.10.0:net/rubygem-gitaly \
 	rubygem-gitlab-kas-grpc>=${GITLAB_KAS_GRPC_VERSION}:net/rubygem-gitlab-kas-grpc \
 	rubygem-gitlab-gkg-proto>=0.7.0<0.8:net/rubygem-gitlab-gkg-proto \
-	rubygem-grpc-gitlab>=1.78.1<1.79:net/rubygem-grpc-gitlab \
+	rubygem-grpc-gitlab>=1.80.0<1.81:net/rubygem-grpc-gitlab \
 	rubygem-google-protobuf>=3.25.8<5:devel/rubygem-google-protobuf \
 	rubygem-toml-rb>=4.1<5:www/rubygem-toml-rb \
 	rubygem-flipper-gitlab>=1.3.6<1.4:devel/rubygem-flipper-gitlab \
@@ -298,13 +298,13 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-lockbox>=1.4.1<1.5:security/rubygem-lockbox \
 	rubygem-valid_email>=0.1<1:mail/rubygem-valid_email \
 	rubygem-jsonb_accessor>=1.4<2:www/rubygem-jsonb_accessor \
-	rubygem-json-gitlab>=2.13.1<2.14:devel/rubygem-json-gitlab \
-	rubygem-json_schemer>=2.3.0<2.4:devel/rubygem-json_schemer \
+	rubygem-json-gitlab>=2.19.2<2.20:devel/rubygem-json-gitlab \
+	rubygem-json_schemer>=2.4.0<2.5:devel/rubygem-json_schemer \
 	rubygem-oj-gitlab>=3.16.16<3.17:devel/rubygem-oj-gitlab \
 	rubygem-oj-introspect>=0.9<1:devel/rubygem-oj-introspect \
 	rubygem-multi_json-gitlab>=1.17.0<1.18:devel/rubygem-multi_json-gitlab \
 	rubygem-yajl-ruby>=1.4.3<1.5:devel/rubygem-yajl-ruby \
-	rubygem-webauthn>=3.0<4:security/rubygem-webauthn \
+	rubygem-webauthn>=3.4.0<4:security/rubygem-webauthn \
 	rubygem-ipaddress>=0.8.3<0.9:net/rubygem-ipaddress \
 	rubygem-parslet1>=1.8<2:textproc/rubygem-parslet1 \
 	rubygem-ed25519>=1.4.0<1.5:security/rubygem-ed25519 \
@@ -326,7 +326,7 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-i18n_data>=0.13.1<1:devel/rubygem-i18n_data \
 	rubygem-gitlab-cloud-connector>=1.46<2:security/rubygem-gitlab-cloud-connector \
 	rubygem-gvltools>=0.4.0<0.5:devel/rubygem-gvltools \
-	rubygem-gitlab_query_language>=0.23.0<0.24:devel/rubygem-gitlab_query_language \
+	rubygem-gitlab_query_language>=0.26.0<0.27:devel/rubygem-gitlab_query_language \
 	rubygem-google-cloud-profiler-v2>=0.3<1:textproc/rubygem-google-cloud-profiler-v2 \
 	rubygem-parallel>=1.27.0<2:sysutils/rubygem-parallel \
 	rubygem-google-cloud-storage_transfer-gitlab>=1.2.0<1.3:net/rubygem-google-cloud-storage_transfer-gitlab \
@@ -442,6 +442,7 @@ do-install:
 	${MV} ${WRKSRC}/lib/support/nginx/gitlab-ssl ${WRKSRC}/lib/support/nginx/gitlab-ssl.sample
 	${MV} ${WRKSRC}/public/robots.txt ${WRKSRC}/public/robots.txt.sample
 	${MKDIR} ${STAGEDIR}${WWWDIR}/app/assets/builds
+	${MKDIR} ${STAGEDIR}${WWWDIR}/app/assets/javascripts/lib/utils/path_helpers
 	${MKDIR} ${STAGEDIR}${WWWDIR}/config/helpers/tailwind
 	${MKDIR} ${STAGEDIR}${WWWDIR}/public/assets
 	${MKDIR} ${STAGEDIR}${WWWDIR}/public/uploads
@@ -472,6 +473,7 @@ post-install:
 	@${ECHO_CMD} "@dir(git,git) ${WWWDIR_REL}/" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/builds/" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/images/auth_buttons/" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/javascripts/lib/utils/path_helpers/" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/javascripts/locale/" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/javascripts/pipeline_wizard/templates/" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(git,git,554) ${WWWDIR_REL}/bin" >> ${TMPPLIST}
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index d8cbd47a78c7..638978ed92b7 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,4 +1,4 @@
-GITLAB_VERSION=		18.10.3
+GITLAB_VERSION=		18.11.0
 GITLAB_PORTREVISION=	6	# decrease this only if GITLAB_KAS_GRPC_VERSION is upgraded
 
 # Git version gitaly should use (from gitlab mirror)
@@ -7,8 +7,8 @@ GITLAB_PORTREVISION=	6	# decrease this only if GITLAB_KAS_GRPC_VERSION is upgrad
 GITLAB_GIT_VERSION=	2.50.0
 # return something like x.yy
 GITLAB_GIT_VERSION_SHORT=	${GITLAB_GIT_VERSION:C/^([0-9]*\.[0-9]*)\..*/\1/}
-GITLAB_GIT_MASTER_VERSION=	e417bf2996fbd77acabbf354ed9b5adedacf91c9
-GITLAB_GIT_PREV_VERSION=	c61120cf654250ac63bdcb5d5ee0bbb9caeae9cd
+GITLAB_GIT_MASTER_VERSION=	b15384c06f77bc2d34d0d3623a8a58218313a561
+GITLAB_GIT_PREV_VERSION=	e417bf2996fbd77acabbf354ed9b5adedacf91c9
 
 # Overwrite version for gitlab-kas-grpc
 #GITLAB_KAS_GRPC_VERSION=	${GITLAB_VERSION}
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index a504fac58d1e..f84e1dd2dff2 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1775709606
-SHA256 (gitlab-foss-v18.10.3.tar.bz2) = 2369e129d2ecf32777bcecd45c19007e784029c649bbe327b4096a37beaace30
-SIZE (gitlab-foss-v18.10.3.tar.bz2) = 134856554
-TIMESTAMP = 1775709654
-SHA256 (gitlab-v18.10.3-ee.tar.bz2) = 91737b716ec4d8f491fb1ff18159694420b735fff4227e132bd5b09fef619e30
-SIZE (gitlab-v18.10.3-ee.tar.bz2) = 153287465
+TIMESTAMP = 1776342388
+SHA256 (gitlab-foss-v18.11.0.tar.bz2) = e8f3f9d8885634f682524dd50e2aec871cd36761ee6a7cd06fe2d07fd36f19e0
+SIZE (gitlab-foss-v18.11.0.tar.bz2) = 134339095
+TIMESTAMP = 1776342389
+SHA256 (gitlab-v18.11.0-ee.tar.bz2) = d80215d720dcb4e0d7c923eddab5e04a013546017a9e1d6431e48f78e8e4517e
+SIZE (gitlab-v18.11.0-ee.tar.bz2) = 153144216
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index 07addd8dc048..26fd1e56cd41 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,6 +1,6 @@
---- Gemfile.orig	2026-03-18 13:38:20 UTC
+--- Gemfile.orig	2026-04-15 21:42:44 UTC
 +++ Gemfile
-@@ -169,7 +169,7 @@ gem 'graphql', '2.5.11', feature_category: :api
+@@ -167,7 +167,7 @@ gem 'graphql', '2.5.11', feature_category: :api
  
  # GraphQL API
  gem 'graphql', '2.5.11', feature_category: :api
@@ -9,7 +9,7 @@
  gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api
  
  # Cells
-@@ -298,7 +298,7 @@ gem 'state_machines-activerecord', '~> 0.100.0', featu
+@@ -296,7 +296,7 @@ gem 'state_machines-activerecord', '~> 0.100.0', featu
  gem 'state_machines-activerecord', '~> 0.100.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
  
  # Background jobs
@@ -18,7 +18,7 @@
  gem 'sidekiq-cron', '~> 2.3.0', feature_category: :scalability
  gem 'gitlab-sidekiq-fetcher',
    path: 'vendor/gems/sidekiq-reliable-fetch',
-@@ -475,137 +475,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared #
+@@ -476,136 +476,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared #
  
  gem 'warning', '~> 1.5.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
  
@@ -52,9 +52,8 @@
 -end
 -
 -group :development, :test do
--  gem 'deprecation_toolkit', '~> 2.2.3', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 -  gem 'bullet', '~> 8.0.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
--  gem 'parser', '= 3.3.10.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
+-  gem 'parser', '= 3.3.11.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 -  gem 'pry-byebug', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 -  gem 'pry-rails', '~> 0.3.9', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 -  gem 'pry-shell', '~> 0.6.4', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
@@ -141,7 +140,7 @@
 -  gem 'webmock', '~> 3.26.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 -  gem 'rails-controller-testing', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 -  gem 'concurrent-ruby', '~> 1.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
--  gem 'test-prof', '~> 1.5.0', feature_category: :tooling
+-  gem 'test-prof', '~> 1.6.0', feature_category: :tooling
 -  gem 'rspec_junit_formatter', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 -  gem 'guard-rspec', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 -  gem 'axe-core-rspec', '~> 4.10.0', feature_category: :tooling
@@ -150,14 +149,14 @@
 -  # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
 -  gem 'derailed_benchmarks', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
 -
--  gem 'gitlab_quality-test_tooling', '~> 3.9.0', require: false, feature_category: :tooling
+-  gem 'gitlab_quality-test_tooling', '~> 3.10.0', require: false, feature_category: :tooling
 -end
 -
  gem 'octokit', '~> 9.0', feature_category: :importers
  # Needed by octokit: https://github.com/octokit/octokit.rb/pull/1688
  gem 'faraday-multipart', '~> 1.0', feature_category: :importers
-@@ -642,7 +520,7 @@ gem 'gitaly', '~> 18.8.0', feature_category: :gitaly
- gem 'gitaly', '~> 18.8.0', feature_category: :gitaly
+@@ -642,7 +521,7 @@ gem 'gitaly', '~> 18.10.0', feature_category: :gitaly
+ gem 'gitaly', '~> 18.10.0', feature_category: :gitaly
  
  # KAS GRPC protocol definitions
 -gem 'gitlab-kas-grpc', '~> 18.5.0-rc4', feature_category: :deployment_management
@@ -165,7 +164,7 @@
  
  # Knowledge Graph GRPC protocol definitions
  gem 'gitlab-gkg-proto', '~> 0.7.0', feature_category: :knowledge_graph
-@@ -668,7 +546,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :
+@@ -668,7 +547,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :
  gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
  
  # Countries list
@@ -174,7 +173,7 @@
  
  gem 'retriable', '~> 3.1.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839
  
-@@ -749,11 +627,16 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
+@@ -749,11 +628,16 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
  
  gem 'duo_api', '~> 1.3', feature_category: :system_access
  
diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example
index 0a64246613f1..c16c208783c7 100644
--- a/www/gitlab/files/patch-config_gitlab.yml.example
+++ b/www/gitlab/files/patch-config_gitlab.yml.example
@@ -1,6 +1,6 @@
---- config/gitlab.yml.example.orig	2026-03-18 13:38:20 UTC
+--- config/gitlab.yml.example.orig	2026-04-15 21:42:44 UTC
 +++ config/gitlab.yml.example
-@@ -551,7 +551,7 @@ production: &base
+@@ -567,7 +567,7 @@ production: &base
    ## GitLab Pages
    pages:
      enabled: false
@@ -9,7 +9,7 @@
      # The location where pages are stored (default: shared/pages).
      # path: shared/pages
  
-@@ -1326,7 +1326,7 @@ production: &base
+@@ -1342,7 +1342,7 @@ production: &base
    repositories:
      storages: # You must have at least a `default` storage path.
        default:
@@ -18,7 +18,7 @@
          # For DNS-based load balancing with TLS, use: dns+tls://[authority_host]:[authority_port]/[host]:[port]
          # The host:port portion will be used as the TLS server name for SNI.
          # Example: dns+tls://1.1.1.1/gitaly.example.com:8075
-@@ -1335,7 +1335,7 @@ production: &base
+@@ -1351,7 +1351,7 @@ production: &base
    ## Backup settings
    backup:
      path: "tmp/backups"   # Relative paths are relative to Rails.root (default: tmp/backups/)
@@ -27,7 +27,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
-@@ -1370,12 +1370,12 @@ production: &base
+@@ -1386,12 +1386,12 @@ production: &base
  
    ## GitLab Shell settings
    gitlab_shell:
@@ -43,7 +43,7 @@
  
      # Git over HTTP
      upload_pack: true
-@@ -1390,7 +1390,7 @@ production: &base
+@@ -1406,7 +1406,7 @@ 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).
@@ -52,7 +52,7 @@
  
    database_traffic_capture:
      config:
-@@ -1416,7 +1416,7 @@ production: &base
+@@ -1432,7 +1432,7 @@ production: &base
      # enabled: true
      # File that contains the secret key for verifying access for gitlab-kas.
      # Default is '.gitlab_kas_secret' relative to Rails.root (i.e. root of the GitLab app).
@@ -61,7 +61,7 @@
  
      # The URL to the external KAS API (used by the Kubernetes agents)
      # external_url: wss://kas.example.com
-@@ -1437,13 +1437,13 @@ production: &base
+@@ -1453,13 +1453,13 @@ production: &base
  
    ## GitLab Elasticsearch settings
    elasticsearch:
@@ -77,7 +77,7 @@
  
    ## Webpack settings
    # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
-@@ -1464,18 +1464,18 @@ production: &base
+@@ -1480,18 +1480,18 @@ production: &base
  
      # Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq.
      sidekiq_exporter:
@@ -103,7 +103,7 @@
  
      # Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma.
      web_exporter:
-@@ -1702,13 +1702,13 @@ test:
+@@ -1729,13 +1729,13 @@ test:
          gitaly_address: unix:tmp/tests/gitaly/praefect.socket
  
    gitaly:
diff --git a/www/gitlab/files/patch-package.json b/www/gitlab/files/patch-package.json
deleted file mode 100644
index a3e1b75ba6a0..000000000000
--- a/www/gitlab/files/patch-package.json
+++ /dev/null
@@ -1,12 +0,0 @@
---- package.json.orig	2026-02-18 17:09:38 UTC
-+++ package.json
-@@ -320,7 +320,8 @@
-     "@types/node": "14.17.5",
-     "chokidar": "^3.5.3",
-     "nwsapi": "2.2.2",
--    "tough-cookie": "4.1.3"
-+    "tough-cookie": "4.1.3",
-+    "tree-sitter": "0.22.4"
-   },
-   "engines": {
-     "node": ">=12.22.1",
diff --git a/www/gitlab/pkg-message b/www/gitlab/pkg-message
index c9c05322d26a..642c499194ba 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.com/mfechner/freebsd-gitlab-docu/blob/master/install/18.10-freebsd.md
+https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/install/18.11-freebsd.md
 EOM
   type: install
 }
@@ -20,7 +20,7 @@ EOM
 If you just installed an major upgrade of GitLab, for example you
 switched from 18.6.x to 18.7.x, please follow the instructions in the guide at:
 
-https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/18.9-18.10-freebsd.md
+https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/18.10-18.11-freebsd.md
 
 If you just installed an minor upgrade of GitLab please follow
 the instructions in the guide at: