summaryrefslogtreecommitdiff
path: root/www/gitlab
diff options
context:
space:
mode:
Diffstat (limited to 'www/gitlab')
-rw-r--r--www/gitlab/Makefile37
-rw-r--r--www/gitlab/Makefile.common4
-rw-r--r--www/gitlab/distinfo12
-rw-r--r--www/gitlab/files/patch-Gemfile27
-rw-r--r--www/gitlab/files/patch-config_gitlab.yml.example18
-rw-r--r--www/gitlab/files/patch-config_initializers_sprockets__patch.rb11
-rw-r--r--www/gitlab/files/patch-gems_bundler-checksum_bundler-checksum.gemspec (renamed from www/gitlab/files/patch-vendor_gems_bundler-checksum_bundler-checksum.gemspec)4
-rw-r--r--www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec9
-rw-r--r--www/gitlab/pkg-message6
9 files changed, 64 insertions, 64 deletions
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index 8db1cc48aeb4..8bb15d8f52a1 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -29,11 +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.5.1:textproc/gitlab-elasticsearch-indexer \
+ gitlab-elasticsearch-indexer>=5.7.0:textproc/gitlab-elasticsearch-indexer \
gitlab-agent>=${GITLAB_VERSION}:net/gitlab-agent \
gitlab-pages>=${GITLAB_VERSION}:www/gitlab-pages \
- gitlab-shell>=14.42.0:devel/gitlab-shell \
+ gitlab-shell>=14.43.0:devel/gitlab-shell \
gitlab-workhorse>=${GITLAB_VERSION}:www/gitlab-workhorse \
+ gitlab-zoekt-indexer>=0.24.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 \
@@ -44,13 +45,13 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-net-pop>=0:mail/rubygem-net-pop \
rubygem-rails-gitlab>=7.1.5.1<7.2:www/rubygem-rails-gitlab \
rubygem-mutex_m>=0.3<1:devel/rubygem-mutex_m \
- rubygem-drb>=2.2.1<3:devel/rubygem-drb \
+ rubygem-drb-gitlab>=2.2.3<3:devel/rubygem-drb-gitlab \
rubygem-bootsnap>=1.18.6<1.19:devel/rubygem-bootsnap \
rubygem-ffi>=1.17.2<2:devel/rubygem-ffi \
- rubygem-openssl>=3.2.0<4:security/rubygem-openssl \
- rubygem-gitlab-secret_detection>=0.29.1<1:security/rubygem-gitlab-secret_detection \
+ rubygem-openssl>=3.3.0<4:security/rubygem-openssl \
+ rubygem-gitlab-secret_detection>=0.33.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.0<3.8:devel/rubygem-sprockets-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>=1.5.9<1.6:databases/rubygem-pg \
@@ -69,7 +70,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-rexml>=3.4.1<3.5:textproc/rubygem-rexml \
rubygem-ruby-saml-gitlab>=1.18<2:security/rubygem-ruby-saml-gitlab \
rubygem-omniauth-saml-gitlab>=2.2.3<3:security/rubygem-omniauth-saml-gitlab \
- rubygem-omniauth>=2.1.2<3:security/rubygem-omniauth \
+ rubygem-omniauth>=2.1.3<3:security/rubygem-omniauth \
rubygem-omniauth-auth0-gitlab>=3.1.1<3.2.0:net/rubygem-omniauth-auth0-gitlab \
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 \
@@ -91,7 +92,7 @@ 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.21<3:security/rubygem-acme-client-gitlab \
+ rubygem-acme-client-gitlab>=2.0.22<3:security/rubygem-acme-client-gitlab \
rubygem-browser5>=5.3.1<5.4:www/rubygem-browser5 \
rubygem-ohai>=18.1.18<19:sysutils/rubygem-ohai \
rubygem-gpgme>=2.0.24<2.1.0:security/rubygem-gpgme \
@@ -139,7 +140,7 @@ 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.225.0<3.226:devel/rubygem-aws-sdk-core-gitlab \
- rubygem-aws-sdk-cloudformation-gitlab>=1.131<2:devel/rubygem-aws-sdk-cloudformation-gitlab \
+ rubygem-aws-sdk-cloudformation-gitlab>=1.133<2:devel/rubygem-aws-sdk-cloudformation-gitlab \
rubygem-aws-sdk-s3-gitlab>=1.189.0<1.190: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 \
@@ -165,7 +166,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.13,3<2.3,3:www/rubygem-rack22 \
+ rubygem-rack22>=2.2.17,3<2.3,3:www/rubygem-rack22 \
rubygem-rack-timeout>=0.7.0<0.8:www/rubygem-rack-timeout \
rubygem-puma>=6.6.0<6.6.1:www/rubygem-puma \
rubygem-sd_notify>=0.1.1<0.2:devel/rubygem-sd_notify \
@@ -188,7 +189,6 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
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 \
rubygem-slack-messenger>=2.3.5<2.4.0:devel/rubygem-slack-messenger \
- rubygem-ruby-fogbugz>=0.3.0<0.4.0:devel/rubygem-ruby-fogbugz \
rubygem-kubeclient>=4.11.0<4.12.0:www/rubygem-kubeclient \
rubygem-ruby-openai37>=3.7<4:www/rubygem-ruby-openai37 \
rubygem-circuitbox>=2.0.0<2.1:www/rubygem-circuitbox \
@@ -215,7 +215,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.37.0<0.38:devel/rubygem-gitlab-labkit \
+ rubygem-gitlab-labkit>=0.39.0<0.40:devel/rubygem-gitlab-labkit \
rubygem-thrift>=0.16.0: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 \
@@ -227,7 +227,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
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-gitlab-security_report_schemas>=0.1.2.min15.0.0.max15.2.1<0.1.2.min15.0.0.max15.2.2:devel/rubygem-gitlab-security_report_schemas \
+ rubygem-gitlab-security_report_schemas>=0.1.3.min15.0.0.max15.2.2<0.1.3.min15.0.0.max15.2.3:devel/rubygem-gitlab-security_report_schemas \
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 \
@@ -257,12 +257,12 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-license_finder-gitlab>=7.2.1<8:devel/rubygem-license_finder-gitlab \
rubygem-rspec>=3.0<4:devel/rubygem-rspec \
rubygem-octokit-gitlab>=9.0<10:net/rubygem-octokit-gitlab \
- rubygem-faraday-multipart>=1.0<2:www/rubygem-faraday-multipart \
+ rubygem-faraday-multipart>=1.1.1<2:www/rubygem-faraday-multipart \
rubygem-gitlab-mail_room>=0.0.27<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.27<0.3:devel/rubygem-stackprof \
- rubygem-rbtrace>=0.4.14<1.0:devel/rubygem-rbtrace \
+ rubygem-rbtrace>=0.5.2<1.0:devel/rubygem-rbtrace \
rubygem-memory_profiler>=1.0<2.0:devel/rubygem-memory_profiler \
rubygem-activerecord-explain-analyze>=0.1<1.0:databases/rubygem-activerecord-explain-analyze \
rubygem-oauth2-gitlab>=2.0.10<3:net/rubygem-oauth2-gitlab \
@@ -305,6 +305,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
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-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 \
@@ -316,7 +317,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-gitlab-sdk>=0.3.0<0.4:devel/rubygem-gitlab-sdk \
rubygem-paper_trail>=16.0<17:devel/rubygem-paper_trail \
rubygem-i18n_data>=0.13.1<1:devel/rubygem-i18n_data \
- rubygem-gitlab-cloud-connector>=1.17<2:security/rubygem-gitlab-cloud-connector \
+ rubygem-gitlab-cloud-connector>=1.21<2:security/rubygem-gitlab-cloud-connector \
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 \
@@ -345,7 +346,8 @@ GL_PROJECT= gitlab-foss
USE_RC_SUBR= gitlab
-SHEBANG_FILES= scripts/build_assets_image \
+SHEBANG_FILES= gems/bundler-checksum/test/project_with_checksum_lock/scripts/test \
+ scripts/build_assets_image \
scripts/build_qa_image \
scripts/build_gdk_image \
scripts/compile_assets \
@@ -359,7 +361,6 @@ SHEBANG_FILES= scripts/build_assets_image \
.lefthook/pre-push/merge_conflicts \
qa/gdk/entrypoint \
qa/bin/test \
- vendor/gems/bundler-checksum/test/project_with_checksum_lock/scripts/test \
vendor/gems/sidekiq/scripts/update-sidekiq.sh
CONFLICTS_INSTALL= gitolite \
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index 864063c1365a..5b26abcfe873 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,10 +1,10 @@
-GITLAB_VERSION= 18.1.1
+GITLAB_VERSION= 18.2.0
GITLAB_PORTREVISION= 0
# 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.49.0
+GITLAB_GIT_VERSION= 2.50.0
# 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 f3d977a2ab27..df7dca2e03fe 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1750904269
-SHA256 (gitlab-foss-v18.1.1.tar.bz2) = f88fcf557bad4ed378c12b2cca9321e6014d4aae4426ddb6cde185a6ecb54d11
-SIZE (gitlab-foss-v18.1.1.tar.bz2) = 119445108
-TIMESTAMP = 1750904310
-SHA256 (gitlab-v18.1.1-ee.tar.bz2) = e2b052cee4fff6330558b78ac6efd3619681b95b7dd949961267c1370aecdd21
-SIZE (gitlab-v18.1.1-ee.tar.bz2) = 134748693
+TIMESTAMP = 1752677001
+SHA256 (gitlab-foss-v18.2.0.tar.bz2) = 23a1309fb73f19ccfc3100611e1149a3405563862d697829e9cf0080c9487565
+SIZE (gitlab-foss-v18.2.0.tar.bz2) = 121280838
+TIMESTAMP = 1752677001
+SHA256 (gitlab-v18.2.0-ee.tar.bz2) = 867f7292eec847e786a56c7fb15c7d8139993e3e29e2e7dd0bc9f580167470e9
+SIZE (gitlab-v18.2.0-ee.tar.bz2) = 136600640
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index 704da6697d22..12b4438204ba 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig 2025-06-18 04:18:20 UTC
+--- Gemfile.orig 2025-07-16 11:39:10 UTC
+++ Gemfile
@@ -164,8 +164,8 @@ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', fea
gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared
@@ -38,7 +38,7 @@
gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability
gem 'gitlab-sidekiq-fetcher',
path: 'vendor/gems/sidekiq-reliable-fetch',
-@@ -472,143 +472,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared
+@@ -465,143 +465,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared
gem 'warning', '~> 1.5.0', feature_category: :shared
@@ -85,7 +85,7 @@
-
- gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database
- gem 'rspec-rails', '~> 7.1.0', feature_category: :shared
-- gem 'factory_bot_rails', '~> 6.4.3', feature_category: :tooling
+- gem 'factory_bot_rails', '~> 6.5.0', feature_category: :tooling
-
- # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
- gem 'minitest', '~> 5.11.0', feature_category: :shared
@@ -135,7 +135,7 @@
- gem 'simplecov', '~> 0.22', require: false, feature_category: :tooling
- gem 'simplecov-lcov', '~> 0.8.0', require: false, feature_category: :tooling
- gem 'simplecov-cobertura', '~> 2.1.0', require: false, feature_category: :tooling
-- gem 'undercover', '~> 0.6.0', require: false, feature_category: :tooling
+- gem 'undercover', '~> 0.7.0', require: false, feature_category: :tooling
-end
-
# Gems required in omnibus-gitlab pipeline
@@ -182,16 +182,21 @@
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
-@@ -646,7 +518,7 @@ gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :
+@@ -639,11 +511,11 @@ gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :
gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :gitaly
# KAS GRPC protocol definitions
--gem 'gitlab-kas-grpc', '~> 17.11.0', feature_category: :deployment_management
-+gem 'gitlab-kas-grpc', '~> 18.1.0', feature_category: :deployment_management
+-gem 'gitlab-kas-grpc', '~> 18.1.0', feature_category: :deployment_management
++gem 'gitlab-kas-grpc', '~> 18.2.0', feature_category: :deployment_management
- gem 'grpc', '~> 1.72.0', feature_category: :shared
+ # Lock until 1.74.0 is available
+ # https://gitlab.com/gitlab-com/gl-infra/production/-/issues/20067
+-gem 'grpc', '= 1.63.0', feature_category: :shared
++gem 'grpc', '~> 1.63', feature_category: :shared
-@@ -669,7 +541,7 @@ gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :
+ gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared
+
+@@ -664,7 +536,7 @@ gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :
gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :shared
# Countries list
@@ -200,7 +205,7 @@
gem 'retriable', '~> 3.1.2', feature_category: :shared
-@@ -750,10 +622,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
+@@ -746,10 +618,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
gem 'duo_api', '~> 1.3', feature_category: :system_access
@@ -216,4 +221,4 @@
-gem "i18n_data", "~> 0.13.1", feature_category: :system_access
+gem "i18n_data", "~> 0.13", feature_category: :system_access
- gem "gitlab-cloud-connector", "~> 1.14", require: 'gitlab/cloud_connector', feature_category: :cloud_connector
+ gem "gitlab-cloud-connector", "~> 1.21", require: 'gitlab/cloud_connector', feature_category: :plan_provisioning
diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example
index 334de9d0c6fb..d06f8232e96f 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-06-18 04:18:20 UTC
+--- config/gitlab.yml.example.orig 2025-07-16 11:39:10 UTC
+++ config/gitlab.yml.example
-@@ -493,7 +493,7 @@ production: &base
+@@ -498,7 +498,7 @@ production: &base
## GitLab Pages
pages:
enabled: false
@@ -9,7 +9,7 @@
# The location where pages are stored (default: shared/pages).
# path: shared/pages
-@@ -1238,13 +1238,13 @@ production: &base
+@@ -1243,13 +1243,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
-@@ -1279,12 +1279,12 @@ production: &base
+@@ -1284,12 +1284,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@@ -41,7 +41,7 @@
# Git over HTTP
upload_pack: true
-@@ -1299,7 +1299,7 @@ production: &base
+@@ -1304,7 +1304,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).
@@ -50,7 +50,7 @@
cell:
# enabled: false
-@@ -1317,7 +1317,7 @@ production: &base
+@@ -1322,7 +1322,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).
@@ -59,7 +59,7 @@
# The URL to the external KAS API (used by the Kubernetes agents)
# external_url: wss://kas.example.com
-@@ -1344,13 +1344,13 @@ production: &base
+@@ -1349,13 +1349,13 @@ production: &base
## GitLab Elasticsearch settings
elasticsearch:
@@ -75,7 +75,7 @@
## Webpack settings
# If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
-@@ -1371,18 +1371,18 @@ production: &base
+@@ -1376,18 +1376,18 @@ production: &base
# Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq.
sidekiq_exporter:
@@ -101,7 +101,7 @@
# Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma.
web_exporter:
-@@ -1609,13 +1609,13 @@ test:
+@@ -1614,13 +1614,13 @@ test:
gitaly_address: unix:tmp/tests/gitaly/praefect.socket
gitaly:
diff --git a/www/gitlab/files/patch-config_initializers_sprockets__patch.rb b/www/gitlab/files/patch-config_initializers_sprockets__patch.rb
deleted file mode 100644
index 8b031049c646..000000000000
--- a/www/gitlab/files/patch-config_initializers_sprockets__patch.rb
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/initializers/sprockets_patch.rb.orig 2024-09-24 23:32:11 UTC
-+++ config/initializers/sprockets_patch.rb
-@@ -8,7 +8,7 @@ require 'sprockets/utils'
-
- require 'sprockets/utils'
-
--unless Gem::Version.new(Sprockets::VERSION) == Gem::Version.new('3.7.2')
-+unless Gem::Version.new(Sprockets::VERSION) == Gem::Version.new('3.7.5')
- raise 'New version of Sprockets detected. This patch can likely be removed.'
- end
-
diff --git a/www/gitlab/files/patch-vendor_gems_bundler-checksum_bundler-checksum.gemspec b/www/gitlab/files/patch-gems_bundler-checksum_bundler-checksum.gemspec
index 915cd5764c09..4d5a8375456e 100644
--- a/www/gitlab/files/patch-vendor_gems_bundler-checksum_bundler-checksum.gemspec
+++ b/www/gitlab/files/patch-gems_bundler-checksum_bundler-checksum.gemspec
@@ -1,5 +1,5 @@
---- vendor/gems/bundler-checksum/bundler-checksum.gemspec.orig 2024-07-09 07:11:30 UTC
-+++ vendor/gems/bundler-checksum/bundler-checksum.gemspec
+--- gems/bundler-checksum/bundler-checksum.gemspec.orig 2025-07-16 16:34:28 UTC
++++ gems/bundler-checksum/bundler-checksum.gemspec
@@ -14,8 +14,7 @@ Gem::Specification.new do |spec|
spec.license = 'MIT'
diff --git a/www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec b/www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec
index cf08a9593f99..8912856cee2b 100644
--- a/www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec
+++ b/www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec
@@ -1,4 +1,4 @@
---- gems/gitlab-backup-cli/gitlab-backup-cli.gemspec.orig 2025-06-18 04:18:20 UTC
+--- gems/gitlab-backup-cli/gitlab-backup-cli.gemspec.orig 2025-07-09 01:48:55 UTC
+++ gems/gitlab-backup-cli/gitlab-backup-cli.gemspec
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
spec.add_dependency "activerecord", ">= 7"
@@ -9,7 +9,12 @@
spec.add_dependency "google-cloud-storage_transfer", "~> 1.2.0"
spec.add_dependency "mutex_m", "~> 0.3"
spec.add_dependency "pg", "~> 1.5.6"
-@@ -44,7 +44,7 @@ Gem::Specification.new do |spec|
+@@ -40,11 +40,11 @@ Gem::Specification.new do |spec|
+ spec.add_dependency "concurrent-ruby", "~> 1.1"
+ spec.add_dependency "faraday", "~> 2"
+ spec.add_dependency "google-protobuf", "~> 3.25", ">= 3.25.3"
+- spec.add_dependency "grpc", "= 1.63.0"
++ spec.add_dependency "grpc", "~> 1.63"
spec.add_dependency "json", "~> 2.7"
spec.add_dependency "jwt", "~> 2.5"
spec.add_dependency "logger", "~> 1.5"
diff --git a/www/gitlab/pkg-message b/www/gitlab/pkg-message
index d736f45ba52d..743b768c3669 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.1-freebsd.md
+https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/install/18.2-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 17.9.x to 17.10.x, please follow the instructions in the guide at:
+switched from 18.1.x to 18.2.x, please follow the instructions in the guide at:
-https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/18.0-18.1-freebsd.md
+https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/18.1-18.2-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-07-18 17:09:18 +0000