aboutsummaryrefslogtreecommitdiff
path: root/www/gitlab
diff options
context:
space:
mode:
Diffstat (limited to 'www/gitlab')
-rw-r--r--www/gitlab/Makefile50
-rw-r--r--www/gitlab/Makefile.common5
-rw-r--r--www/gitlab/distinfo12
-rw-r--r--www/gitlab/files/patch-Gemfile31
-rw-r--r--www/gitlab/files/patch-config_gitlab.yml.example14
-rw-r--r--www/gitlab/pkg-message6
6 files changed, 58 insertions, 60 deletions
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index 5b9d1e9552dd..191c53d788c9 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -29,12 +29,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
# mail/rubygem-net-pop is required as ruby 3.1 removed it
#gitlab-zoekt-indexer>=0.16.0:textproc/gitlab-zoekt-indexer
MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
- gitlab-elasticsearch-indexer>=5.7.0:textproc/gitlab-elasticsearch-indexer \
+ gitlab-elasticsearch-indexer>=5.9.1:textproc/gitlab-elasticsearch-indexer \
gitlab-agent>=${GITLAB_VERSION}:net/gitlab-agent \
gitlab-pages>=${GITLAB_VERSION}:www/gitlab-pages \
gitlab-shell>=14.45.2:devel/gitlab-shell \
gitlab-workhorse>=${GITLAB_VERSION}:www/gitlab-workhorse \
- gitlab-zoekt-indexer>=1.2.0:textproc/gitlab-zoekt-indexer \
+ gitlab-zoekt-indexer>=1.4.4:textproc/gitlab-zoekt-indexer \
redis>=6.2.11:databases/redis \
yarn${NODEJS_SUFFIX}>=1.10.0:www/yarn${NODEJS_SUFFIX} \
gtar>0:archivers/gtar \
@@ -60,14 +60,14 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
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>=1.1.0<1.2:security/rubygem-declarative_policy \
+ rubygem-declarative_policy>=2.0.1<2.1:security/rubygem-declarative_policy \
rubygem-coverband>=6.1.5<6.1.6:www/rubygem-coverband \
rubygem-devise-rails-gitlab>=4.9.3<4.10:devel/rubygem-devise-rails-gitlab \
rubygem-bcrypt>=3.1.20<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 \
- rubygem-rexml>=3.4.1<3.5:textproc/rubygem-rexml \
+ rubygem-rexml>=3.4.2<3.5:textproc/rubygem-rexml \
rubygem-ruby-saml-gitlab>=1.18.1<2:security/rubygem-ruby-saml-gitlab \
rubygem-omniauth-saml-gitlab>=2.2.4<3:security/rubygem-omniauth-saml-gitlab \
rubygem-omniauth-gl>=2.1.3<3:security/rubygem-omniauth-gl \
@@ -96,7 +96,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-browser5>=5.3.1<5.4:www/rubygem-browser5 \
rubygem-ohai>=18.1.18<19:sysutils/rubygem-ohai \
rubygem-gpgme>=2.0.25<2.1.0:security/rubygem-gpgme \
- rubygem-gitlab_omniauth-ldap-gitlab>=2.2.0<2.3.0:net/rubygem-gitlab_omniauth-ldap-gitlab \
+ rubygem-gitlab_omniauth-ldap-gitlab>=2.3.0<2.4.0:net/rubygem-gitlab_omniauth-ldap-gitlab \
rubygem-net-ldap017>=0.17.1<0.18:net/rubygem-net-ldap017 \
rubygem-grape20>=2.0.0<2.1:devel/rubygem-grape20 \
rubygem-grape-entity>=1.0.1<1.1,1:devel/rubygem-grape-entity \
@@ -112,26 +112,27 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-hamlit>=3.0.3<3.1:www/rubygem-hamlit \
rubygem-carrierwave-gitlab>=1.3.4<2.0:www/rubygem-carrierwave-gitlab \
rubygem-mini_magick4>=4.12<5:graphics/rubygem-mini_magick4 \
+ rubygem-marcel-gitlab>=1.0.4<1.1:devel/rubygem-marcel-gitlab \
rubygem-prawn>=0:print/rubygem-prawn \
rubygem-prawn-svg>=0:print/rubygem-prawn-svg \
rubygem-fog-aws-gitlab>=3.28.0<4:net/rubygem-fog-aws-gitlab \
- rubygem-fog-core-gitlab>=2.1.0<2.1.1:devel/rubygem-fog-core-gitlab \
- rubygem-fog-google-gitlab>=1.24.1<1.25:net/rubygem-fog-google-gitlab \
+ rubygem-fog-core-gitlab>=2.5<3:devel/rubygem-fog-core-gitlab \
+ rubygem-fog-google-gitlab>=1.25.0<2:net/rubygem-fog-google-gitlab \
rubygem-fog-local-gitlab>=0.8<1.0:net/rubygem-fog-local-gitlab \
rubygem-fog-aliyun-gitlab>=0.4<1.0:net/rubygem-fog-aliyun-gitlab \
rubygem-gitlab-fog-azure-rm>=2.4.0<2.5:net/rubygem-gitlab-fog-azure-rm \
rubygem-google-apis-storage_v1-gitlab>=0.29<1:devel/rubygem-google-apis-storage_v1-gitlab \
- rubygem-google-cloud-storage-gitlab>=1.45.0<1.46:net/rubygem-google-cloud-storage-gitlab \
+ rubygem-google-cloud-storage-gitlab>=1.57.0<1.58:net/rubygem-google-cloud-storage-gitlab \
rubygem-google-apis-core-gitlab>=0.18.0<0.19:devel/rubygem-google-apis-core-gitlab \
- rubygem-google-apis-compute_v1-gitlab>=0.127.0<0.128:devel/rubygem-google-apis-compute_v1-gitlab \
+ rubygem-google-apis-compute_v1-gitlab>=0.129.0<0.130:devel/rubygem-google-apis-compute_v1-gitlab \
rubygem-google-apis-container_v1>=0.100.0<0.101:devel/rubygem-google-apis-container_v1 \
- rubygem-google-apis-container_v1beta1>=0.43.0<0.44:devel/rubygem-google-apis-container_v1beta1 \
+ rubygem-google-apis-container_v1beta1>=0.90.0<0.91:devel/rubygem-google-apis-container_v1beta1 \
rubygem-google-apis-cloudbilling_v1>=0.22.0<0.23:devel/rubygem-google-apis-cloudbilling_v1 \
rubygem-google-apis-cloudresourcemanager_v1-gitlab>=0.31.0<0.32:devel/rubygem-google-apis-cloudresourcemanager_v1-gitlab \
rubygem-google-apis-iam_v1-gitlab>=0.73.0<0.74:devel/rubygem-google-apis-iam_v1-gitlab \
rubygem-google-apis-serviceusage_v1>=0.28.0<0.29:devel/rubygem-google-apis-serviceusage_v1 \
rubygem-google-apis-sqladmin_v1beta4-gitlab>=0.41.0<0.42:devel/rubygem-google-apis-sqladmin_v1beta4-gitlab \
- rubygem-google-apis-androidpublisher_v3-gitlab>=0.84.0<0.85:devel/rubygem-google-apis-androidpublisher_v3-gitlab \
+ rubygem-google-apis-androidpublisher_v3-gitlab>=0.86.0<0.87:devel/rubygem-google-apis-androidpublisher_v3-gitlab \
rubygem-googleauth-gitlab>=1.14<2:security/rubygem-googleauth-gitlab \
rubygem-google-cloud-artifact_registry-v1>=0.11.0<0.12:textproc/rubygem-google-cloud-artifact_registry-v1 \
rubygem-google-cloud-compute-v1>=2.6.0<2.7:net/rubygem-google-cloud-compute-v1 \
@@ -140,11 +141,11 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-elasticsearch-rails7>=7.2<8:textproc/rubygem-elasticsearch-rails7 \
rubygem-elasticsearch-api-gitlab>=7.17.11<7.18:textproc/rubygem-elasticsearch-api-gitlab \
rubygem-aws-sdk-core-gitlab>=3.226.3<3.227:devel/rubygem-aws-sdk-core-gitlab \
- rubygem-aws-sdk-cloudformation-gitlab>=1.133<2:devel/rubygem-aws-sdk-cloudformation-gitlab \
+ rubygem-aws-sdk-cloudformation-gitlab>=1.134<2:devel/rubygem-aws-sdk-cloudformation-gitlab \
rubygem-aws-sdk-s3-gitlab>=1.193.0<1.194:devel/rubygem-aws-sdk-s3-gitlab \
rubygem-faraday-typhoeus-gitlab>=1.1<2:www/rubygem-faraday-typhoeus-gitlab \
rubygem-faraday_middleware-aws-sigv4-gitlab>=1.0.1<1.1:devel/rubygem-faraday_middleware-aws-sigv4-gitlab \
- rubygem-typhoeus14>=1.4.0<1.5:www/rubygem-typhoeus14 \
+ rubygem-typhoeus-gitlab>=1.4.0<1.5:www/rubygem-typhoeus-gitlab \
rubygem-html-pipeline-gitlab>=2.14.3<2.15:textproc/rubygem-html-pipeline-gitlab \
rubygem-deckar01-task_list-gitlab>=2.3.4<2.4:www/rubygem-deckar01-task_list-gitlab \
rubygem-gitlab-markup>=2.0.0<2.1:textproc/rubygem-gitlab-markup \
@@ -173,7 +174,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-state_machines-activerecord-gitlab>=0.8.0<0.9.0:databases/rubygem-state_machines-activerecord-gitlab \
rubygem-sidekiq-gitlab>=7.3.9:devel/rubygem-sidekiq-gitlab \
rubygem-sidekiq-cron-rails-gitlab>=1.12.0<1.13:devel/rubygem-sidekiq-cron-rails-gitlab \
- rubygem-fugit111>=1.11.1<1.12:devel/rubygem-fugit111 \
+ rubygem-fugit-gitlab>=1.11.2<1.12:devel/rubygem-fugit-gitlab \
rubygem-httparty-gitlab>=0.23.0<0.24:www/rubygem-httparty-gitlab \
rubygem-rainbow>=3.1.1<4.0:devel/rubygem-rainbow \
rubygem-ruby-progressbar>=1.11<2:devel/rubygem-ruby-progressbar \
@@ -186,7 +187,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-redis-client>=0.25.1<1:databases/rubygem-redis-client \
rubygem-redis-cluster-client>=0.13.5<1:databases/rubygem-redis-cluster-client \
rubygem-redis-clustering-gitlab>=5.4.0<5.4.1:databases/rubygem-redis-clustering-gitlab \
- rubygem-connection_pool>=2.5.3<2.6:net/rubygem-connection_pool \
+ rubygem-connection_pool>=2.5.4<2.6:net/rubygem-connection_pool \
rubygem-redis-actionpack-rails-gitlab>=5.5.0<5.6:databases/rubygem-redis-actionpack-rails-gitlab \
rubygem-jira-ruby-gitlab>=2.3.0<2.4:devel/rubygem-jira-ruby-gitlab \
rubygem-atlassian-jwt>=0.2.1<0.3.0:www/rubygem-atlassian-jwt \
@@ -206,9 +207,9 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-rack-proxy>=0.7.7<0.8.0:www/rubygem-rack-proxy \
rubygem-cssbundling-rails-rails-gitlab>=1.4.3<1.5:www/rubygem-cssbundling-rails-rails-gitlab \
rubygem-terser>=1.0.2<1.0.3:textproc/rubygem-terser \
- rubygem-click_house-client>=0.3.5<0.3.6:databases/rubygem-click_house-client \
+ rubygem-click_house-client>=0.5.1<0.6:databases/rubygem-click_house-client \
rubygem-addressable>=2.8<3:www/rubygem-addressable \
- rubygem-gon-rails-gitlab>=6.4.0<6.5:www/rubygem-gon-rails-gitlab \
+ rubygem-gon-rails-gitlab>=6.5.0<6.6:www/rubygem-gon-rails-gitlab \
rubygem-request_store>=1.7.0<1.8:devel/rubygem-request_store \
rubygem-base32>=0.3.4<0.4.0:converters/rubygem-base32 \
rubygem-gitlab-license>=2.6<3:devel/rubygem-gitlab-license \
@@ -218,7 +219,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-sentry-sidekiq>=5.23.0<5.24:devel/rubygem-sentry-sidekiq \
rubygem-pg_query>=6.1.0<6.2:databases/rubygem-pg_query \
rubygem-premailer-rails-rails-gitlab>=1.12.0<1.13:mail/rubygem-premailer-rails-rails-gitlab \
- rubygem-gitlab-labkit>=0.39.0<0.40:devel/rubygem-gitlab-labkit \
+ rubygem-gitlab-labkit>=0.40.0<0.41:devel/rubygem-gitlab-labkit \
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 \
@@ -229,9 +230,11 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-snowplow-tracker>=0.8.0<1:devel/rubygem-snowplow-tracker \
rubygem-webrick>=1.9.0<1.10:www/rubygem-webrick \
rubygem-prometheus-client-mmap>=1.2.10<1.3:devel/rubygem-prometheus-client-mmap \
- rubygem-async-gitlab>=2.24.0<2.25:devel/rubygem-async-gitlab \
+ rubygem-async-gitlab>=2.28.0<2.29: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-opentelemetry-sdk>=1.5.0:devel/rubygem-opentelemetry-sdk \
rubygem-opentelemetry-exporter-otlp>=0.29.1:devel/rubygem-opentelemetry-exporter-otlp \
rubygem-opentelemetry-instrumentation-active_support>=0.6.0:devel/rubygem-opentelemetry-instrumentation-active_support \
@@ -275,7 +278,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-net-ntp>0:net/rubygem-net-ntp \
rubygem-ssh_data>=1.3<2:security/rubygem-ssh_data \
rubygem-spamcheck>=1.3.3<1.4:net/rubygem-spamcheck \
- rubygem-gitaly>=18.2.1:net/rubygem-gitaly \
+ rubygem-gitaly>=18.4.0:net/rubygem-gitaly \
rubygem-gitlab-kas-grpc>=${GITLAB_KAS_GRPC_VERSION}:net/rubygem-gitlab-kas-grpc \
rubygem-grpc-gitlab>=1.74.0<2:net/rubygem-grpc-gitlab \
rubygem-google-protobuf3>=3.25.8<4:devel/rubygem-google-protobuf3 \
@@ -299,7 +302,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-json_schemer>=2.3.0<2.4:devel/rubygem-json_schemer \
rubygem-oj>=3.16.11<3.17:devel/rubygem-oj \
rubygem-oj-introspect>=0.8<1:devel/rubygem-oj-introspect \
- rubygem-multi_json114>=1.14.1<1.15:devel/rubygem-multi_json114 \
+ 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-ipaddress>=0.8.3<0.9:net/rubygem-ipaddress \
@@ -307,11 +310,12 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-ed25519>=1.4.0<1.5:security/rubygem-ed25519 \
rubygem-cvss-suite>=3.3.0<3.4:security/rubygem-cvss-suite \
rubygem-arr-pm>=0.0.12<0.1:devel/rubygem-arr-pm \
- rubygem-devfile>=0.4.4<0.5:net/rubygem-devfile \
+ rubygem-devfile>=0.4.8<0.5:net/rubygem-devfile \
rubygem-hashdiff>=1.2.0<1.3:devel/rubygem-hashdiff \
rubygem-CFPropertyList-gitlab>=3.0.7<3.1:devel/rubygem-CFPropertyList-gitlab \
rubygem-app_store_connect>=0:net/rubygem-app_store_connect \
- rubygem-telesignenterprise>=2.2<3:devel/rubygem-telesignenterprise \
+ rubygem-telesignenterprise>=2.6<3:devel/rubygem-telesignenterprise \
+ rubygem-base6402>=0.2.0<0.3:converters/rubygem-base6402 \
rubygem-net-protocol>=0.2.2<0.3:net/rubygem-net-protocol \
rubygem-nkf>=0.2.0<0.3:net/rubygem-nkf \
rubygem-net-http>=0.6.0<0.6.1:www/rubygem-net-http \
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index f8a74c64788b..6d44b00038e2 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,10 +1,11 @@
-GITLAB_VERSION= 18.3.5
-GITLAB_PORTREVISION= 0
+GITLAB_VERSION= 18.4.3
+GITLAB_PORTREVISION= 2
# Git version gitaly should use (from gitlab mirror)
# Find current tag from Makefile and .gitlab-ci.yaml
# and from https://gitlab.com/gitlab-org/git/-/tags
GITLAB_GIT_VERSION= 2.50.0
+GITLAB_GIT_MASTER_VERSION= 23466173824c0a0f835c0d790c2f38156ae6284a
# return something like x.yy
GITLAB_GIT_VERSION_SHORT= ${GITLAB_GIT_VERSION:C/^([0-9]*\.[0-9]*)\..*/\1/}
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index 1ac0e8dc35ce..89ed69ca076a 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1761126561
-SHA256 (gitlab-foss-v18.3.5.tar.bz2) = a3fdaee042b98938b6b0d663d297f50b3f7468741b1def98895f991be5cb7fb2
-SIZE (gitlab-foss-v18.3.5.tar.bz2) = 122289928
-TIMESTAMP = 1761126604
-SHA256 (gitlab-v18.3.5-ee.tar.bz2) = 27d8c7de165fe25714305a070707626635f5d9f397837a86279b1ac875576732
-SIZE (gitlab-v18.3.5-ee.tar.bz2) = 138198849
+TIMESTAMP = 1761396302
+SHA256 (gitlab-foss-v18.4.3.tar.bz2) = dd2c1c3261e8ad0547bb612733a5dfa01b186dab409e9b90a15da67617759e5b
+SIZE (gitlab-foss-v18.4.3.tar.bz2) = 122558508
+TIMESTAMP = 1761396303
+SHA256 (gitlab-v18.4.3-ee.tar.bz2) = adc59024b9bd00128bf75b9a6fc3f4178ca41f64fa2043e2a53e4eda5602b72d
+SIZE (gitlab-v18.4.3-ee.tar.bz2) = 138452921
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index 7943be7c3489..c5e64b759360 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig 2025-08-20 06:43:08 UTC
+--- Gemfile.orig 2025-10-21 19:24:47 UTC
+++ Gemfile
@@ -165,7 +165,7 @@ gem 'graphql', '2.5.11', feature_category: :api
@@ -18,13 +18,14 @@
gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability
gem 'gitlab-sidekiq-fetcher',
path: 'vendor/gems/sidekiq-reliable-fetch',
-@@ -468,148 +468,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared
+@@ -473,141 +473,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared
gem 'warning', '~> 1.5.0', feature_category: :shared
-group :development do
- gem 'lefthook', '~> 1.12.0', require: false, feature_category: :tooling
-- gem 'rubocop', feature_category: :tooling
+- gem 'rubocop', feature_category: :tooling, require: false
+- gem 'debug', '~> 1.11.0', feature_category: :shared
-
- gem 'solargraph', '~> 0.54.0', require: false, feature_category: :shared
- gem 'solargraph-rspec', '~> 0.5.1', require: false, feature_category: :shared
@@ -80,9 +81,6 @@
- gem 'benchmark-ips', '~> 2.14.0', require: false, feature_category: :shared
- gem 'benchmark-memory', '~> 0.1', require: false, feature_category: :shared
-
-- # Profiling data from CI/CD pipelines
-- gem 'influxdb-client', '~> 3.1', require: false, feature_category: :tooling
--
- gem 'knapsack', '~> 4.0.0', feature_category: :tooling
- gem 'gitlab-crystalball', '~> 1.1.0', require: false, feature_category: :tooling
- gem 'test_file_finder', '~> 0.3.1', feature_category: :tooling
@@ -97,11 +95,6 @@
-
- gem 'pact', '~> 1.64', feature_category: :shared
-
-- # 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.9.0', feature_category: :shared
--
- gem 'gitlab-housekeeper', path: 'gems/gitlab-housekeeper', feature_category: :tooling
-
- gem 'yard', '~> 0.9', require: false, feature_category: :tooling
@@ -161,26 +154,26 @@
- # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
- gem 'derailed_benchmarks', require: false, feature_category: :shared
-
-- gem 'gitlab_quality-test_tooling', '~> 2.18.0', require: false, feature_category: :tooling
+- gem 'gitlab_quality-test_tooling', '~> 2.20.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
-@@ -643,10 +510,10 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside
+@@ -641,10 +515,10 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside
gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat
# Gitaly GRPC protocol definitions
--gem 'gitaly', '~> 18.2.0', feature_category: :gitaly
-+gem 'gitaly', '~> 18.2', feature_category: :gitaly
+-gem 'gitaly', '~> 18.4.0.pre.rc1', feature_category: :gitaly
++gem 'gitaly', '~> 18.4', feature_category: :gitaly
# KAS GRPC protocol definitions
--gem 'gitlab-kas-grpc', '~> 18.2.0', feature_category: :deployment_management
-+gem 'gitlab-kas-grpc', '~> 18.2', feature_category: :deployment_management
+-gem 'gitlab-kas-grpc', '~> 18.3.0', feature_category: :deployment_management
++gem 'gitlab-kas-grpc', '~> 18.3', feature_category: :deployment_management
gem 'grpc', '~> 1.74.0', feature_category: :shared
-@@ -669,7 +536,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :
+@@ -667,7 +541,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :
gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :shared
# Countries list
@@ -189,7 +182,7 @@
gem 'retriable', '~> 3.1.2', feature_category: :shared
-@@ -750,10 +617,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
+@@ -752,10 +626,15 @@ 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 5c05397684c9..d4e98d985eb3 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 2025-08-20 06:43:08 UTC
+--- config/gitlab.yml.example.orig 2025-10-21 19:24:47 UTC
+++ config/gitlab.yml.example
-@@ -511,7 +511,7 @@ production: &base
+@@ -507,7 +507,7 @@ production: &base
## GitLab Pages
pages:
enabled: false
@@ -9,7 +9,7 @@
# The location where pages are stored (default: shared/pages).
# path: shared/pages
-@@ -1261,13 +1261,13 @@ production: &base
+@@ -1252,13 +1252,13 @@ production: &base
repositories:
storages: # You must have at least a `default` storage path.
default:
@@ -25,7 +25,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
-@@ -1302,12 +1302,12 @@ production: &base
+@@ -1293,12 +1293,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@@ -41,15 +41,15 @@
# Git over HTTP
upload_pack: true
-@@ -1322,7 +1322,7 @@ production: &base
+@@ -1313,7 +1313,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).
- # secret_file: /home/git/gitlab/.gitlab_workhorse_secret
+ # secret_file: %%WWWDIR%%/.gitlab_workhorse_secret
- cell:
- # enabled: false
+ database_traffic_capture:
+ config:
@@ -1340,7 +1340,7 @@ production: &base
# enabled: true
# File that contains the secret key for verifying access for gitlab-kas.
diff --git a/www/gitlab/pkg-message b/www/gitlab/pkg-message
index 089734612436..64b201d3412a 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.3-freebsd.md
+https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/install/18.4-freebsd.md
EOM
type: install
}
@@ -18,9 +18,9 @@ EOM
{
message: <<EOM
If you just installed an major upgrade of GitLab, for example you
-switched from 18.2.x to 18.3.x, please follow the instructions in the guide at:
+switched from 18.3.x to 18.4.x, please follow the instructions in the guide at:
-https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/18.2-18.3-freebsd.md
+https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/18.3-18.4-freebsd.md
If you just installed an minor upgrade of GitLab please follow
the instructions in the guide at:
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-01 02:38:13 +0000