summaryrefslogtreecommitdiff
path: root/www/gitlab
diff options
context:
space:
mode:
Diffstat (limited to 'www/gitlab')
-rw-r--r--www/gitlab/Makefile42
-rw-r--r--www/gitlab/Makefile.common10
-rw-r--r--www/gitlab/distinfo12
-rw-r--r--www/gitlab/files/patch-Gemfile36
-rw-r--r--www/gitlab/files/patch-config_gitlab.yml.example20
-rw-r--r--www/gitlab/pkg-message4
6 files changed, 66 insertions, 58 deletions
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index 3cd469f04bda..17ca43c9922d 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -28,7 +28,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
# 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= gitaly>=${GITLAB_VERSION}:devel/gitaly \
- gitlab-elasticsearch-indexer>=5.4.0:textproc/gitlab-elasticsearch-indexer \
+ gitlab-elasticsearch-indexer>=5.5.0:textproc/gitlab-elasticsearch-indexer \
gitlab-agent>=${GITLAB_VERSION}:net/gitlab-agent \
gitlab-pages>=${GITLAB_VERSION}:www/gitlab-pages \
gitlab-shell>=14.41.0:devel/gitlab-shell \
@@ -47,7 +47,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-bootsnap>=1.18.3<1.19:devel/rubygem-bootsnap \
rubygem-ffi>=1.17.1<2:devel/rubygem-ffi \
rubygem-openssl>=3.2.0<4:security/rubygem-openssl \
- rubygem-gitlab-secret_detection>=0.19.0<1:security/rubygem-gitlab-secret_detection \
+ rubygem-gitlab-secret_detection>=0.23.0<1:security/rubygem-gitlab-secret_detection \
rubygem-responders-rails70>=3.0<4.0:www/rubygem-responders-rails70 \
rubygem-sprockets3>=3.7.0<3.8:devel/rubygem-sprockets3 \
rubygem-sprockets-rails-rails70>=3.5.2<3.6:devel/rubygem-sprockets-rails-rails70 \
@@ -66,7 +66,8 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
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-ruby-saml-gitlab>=1.18.0<1.19:security/rubygem-ruby-saml-gitlab \
+ 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-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 \
@@ -74,7 +75,6 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-omniauth-github-gitlab>=2.0.1<2.1:net/rubygem-omniauth-github-gitlab \
rubygem-omniauth-google-oauth2-gitlab>=1.1<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-saml-gitlab>=2.2.2<3:security/rubygem-omniauth-saml-gitlab \
rubygem-omniauth-shibboleth-redux>=2.0<3:security/rubygem-omniauth-shibboleth-redux \
rubygem-omniauth_openid_connect>=0.8.0<0.9:net/rubygem-omniauth_openid_connect \
rubygem-openid_connect>=2.3.1<2.4:net/rubygem-openid_connect \
@@ -89,7 +89,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-rqrcode>=2.2.0<3:www/rubygem-rqrcode \
rubygem-validates_hostname>=1.0.13<1.1.0:dns/rubygem-validates_hostname \
rubygem-rubyzip>=2.3.2<2.4:archivers/rubygem-rubyzip \
- rubygem-acme-client-gitlab>=2.0.20<3:security/rubygem-acme-client-gitlab \
+ rubygem-acme-client-gitlab>=2.0.21<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 \
@@ -103,7 +103,6 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-rack-cors>=2.0.1<2.1:www/rubygem-rack-cors \
rubygem-graphql>=2.4.11<2.5:devel/rubygem-graphql \
rubygem-apollo_upload_server>=2.1.6<2.2:net/rubygem-apollo_upload_server \
- rubygem-graphlient>=0.8.0<0.9:devel/rubygem-graphlient \
rubygem-ffaker>=2.24.0<3:devel/rubygem-ffaker \
rubygem-hashie>=5.0.0<5.1:devel/rubygem-hashie \
rubygem-kaminari-rails70>=1.2.2<1.3:www/rubygem-kaminari-rails70 \
@@ -156,18 +155,18 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-asciidoctor-kroki>=0.10.0<0.11:textproc/rubygem-asciidoctor-kroki \
rubygem-rouge-gitlab>=4.5.1<4.6:textproc/rubygem-rouge-gitlab \
rubygem-truncato>=0.7.13<0.8.0:textproc/rubygem-truncato \
- rubygem-nokogiri>=1.18.3<2:textproc/rubygem-nokogiri \
- rubygem-gitlab-glfm-markdown>=0.0.27<0.1:textproc/rubygem-gitlab-glfm-markdown \
+ rubygem-nokogiri>=1.18.7<2:textproc/rubygem-nokogiri \
+ rubygem-gitlab-glfm-markdown>=0.0.29<0.1:textproc/rubygem-gitlab-glfm-markdown \
rubygem-tanuki_emoji>=0.13<1:graphics/rubygem-tanuki_emoji \
rubygem-unicode-emoji>=4.0.4<5:devel/rubygem-unicode-emoji \
rubygem-icalendar>=2.10.3<2.11:devel/rubygem-icalendar \
rubygem-diffy>=3.4<4:textproc/rubygem-diffy \
- rubygem-rack22>=2.2.11,3<2.3,3:www/rubygem-rack22 \
+ rubygem-rack22>=2.2.13,3<2.3,3:www/rubygem-rack22 \
rubygem-rack-timeout>=0.7.0<0.8:www/rubygem-rack-timeout \
rubygem-puma>=6.5.0<7:www/rubygem-puma \
rubygem-sd_notify>=0.1.1<0.2:devel/rubygem-sd_notify \
rubygem-state_machines-activerecord08>=0.8.0<0.9.0:databases/rubygem-state_machines-activerecord08 \
- rubygem-sidekiq72>=7.2.4<7.3:devel/rubygem-sidekiq72 \
+ rubygem-sidekiq-gitlab>=7.3.9:devel/rubygem-sidekiq-gitlab \
rubygem-sidekiq-cron-rails70>=1.12.0<1.13:devel/rubygem-sidekiq-cron-rails70 \
rubygem-fugit>=1.11.1<1.12:devel/rubygem-fugit \
rubygem-httparty-gitlab>=0.22.0<0.23:www/rubygem-httparty-gitlab \
@@ -200,7 +199,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-gitlab-chronic>=0.10.6<0.11.0:devel/rubygem-gitlab-chronic \
rubygem-gitlab_chronic_duration>=0.12<1:devel/rubygem-gitlab_chronic_duration \
rubygem-rack-proxy>=0.7.7<0.8.0:www/rubygem-rack-proxy \
- rubygem-cssbundling-rails-gitlab>=1.4.2<1.5:www/rubygem-cssbundling-rails-gitlab \
+ rubygem-cssbundling-rails-rails70>=1.4.3<1.5:www/rubygem-cssbundling-rails-rails70 \
rubygem-terser>=1.0.2<1.0.3:textproc/rubygem-terser \
rubygem-addressable>=2.8<3:www/rubygem-addressable \
rubygem-gon-rails70>=6.4.0<6.5:www/rubygem-gon-rails70 \
@@ -211,7 +210,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-sentry-ruby>=5.22.0<5.23:devel/rubygem-sentry-ruby \
rubygem-sentry-rails>=5.22.0<5.23:devel/rubygem-sentry-rails \
rubygem-sentry-sidekiq>=5.22.0<5.23:devel/rubygem-sentry-sidekiq \
- rubygem-pg_query>=6.0.0<6.1:databases/rubygem-pg_query \
+ rubygem-pg_query>=6.1.0<6.2:databases/rubygem-pg_query \
rubygem-premailer-rails-rails70>=1.12.0<1.13:mail/rubygem-premailer-rails-rails70 \
rubygem-gitlab-labkit>=0.37.0<0.38:devel/rubygem-gitlab-labkit \
rubygem-thrift>=0.16.0:devel/rubygem-thrift \
@@ -224,7 +223,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-snowplow-tracker>=0.8.0<1:devel/rubygem-snowplow-tracker \
rubygem-webrick>=1.8.2<1.10:www/rubygem-webrick \
rubygem-prometheus-client-mmap>=1.2.9<1.3:devel/rubygem-prometheus-client-mmap \
- rubygem-async-gitlab>=2.23.0<2.24:devel/rubygem-async-gitlab \
+ rubygem-async-gitlab>=2.23.1<2.24: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-opentelemetry-sdk>=1.5.0:devel/rubygem-opentelemetry-sdk \
rubygem-opentelemetry-exporter-otlp>=0.29.1:devel/rubygem-opentelemetry-exporter-otlp \
@@ -252,7 +251,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-warning>=1.5.0<1.6:devel/rubygem-warning \
rubygem-git>=1.19.1<2:devel/rubygem-git \
rubygem-gitlab-dangerfiles>=4.8.1<4.9:devel/rubygem-gitlab-dangerfiles \
- rubygem-license_finder-gitlab>=7.0.0<8:devel/rubygem-license_finder-gitlab \
+ 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 \
@@ -271,7 +270,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-ssh_data>=1.3<2:security/rubygem-ssh_data \
rubygem-spamcheck>=1.3.3<1.4:net/rubygem-spamcheck \
rubygem-gitaly>=17.8.4:net/rubygem-gitaly \
- rubygem-gitlab-kas-grpc>=${GITLAB_VERSION}:net/rubygem-gitlab-kas-grpc \
+ rubygem-gitlab-kas-grpc>=${GITLAB_KAS_GRPC_VERSION}:net/rubygem-gitlab-kas-grpc \
rubygem-grpc>=1.63.0<2:net/rubygem-grpc \
rubygem-google-protobuf3>=3.25.6<4:devel/rubygem-google-protobuf3 \
rubygem-toml-rb>=2.2.0<3:www/rubygem-toml-rb \
@@ -290,7 +289,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-lockbox>=1.3.0<1.4: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>=2.10.0<2.11:devel/rubygem-json \
+ rubygem-json>=2.10.2<2.11:devel/rubygem-json \
rubygem-json_schemer>=2.3.0<2.4:devel/rubygem-json_schemer \
rubygem-oj>=3.16.0<3.17:devel/rubygem-oj \
rubygem-oj-introspect>=0.8<1:devel/rubygem-oj-introspect \
@@ -302,7 +301,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-ed25519>=1.3.0<1.4: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-gitlab>=0.1.1<0.2:net/rubygem-devfile-gitlab \
+ rubygem-devfile>=0.4.0<0.5:net/rubygem-devfile \
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 \
@@ -314,7 +313,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-gitlab-sdk>=0.3.0<0.4:devel/rubygem-gitlab-sdk \
rubygem-paper_trail>=15.0<16:devel/rubygem-paper_trail \
rubygem-i18n_data>=0.13.1<1:devel/rubygem-i18n_data \
- rubygem-gitlab-cloud-connector>=1.0.0<1.1:security/rubygem-gitlab-cloud-connector \
+ rubygem-gitlab-cloud-connector>=1.5<2:security/rubygem-gitlab-cloud-connector \
rubygem-google-cloud-profiler-v2>=0.3<1:textproc/rubygem-google-cloud-profiler-v2 \
rubygem-parallel>=1.26.3<2:sysutils/rubygem-parallel \
rubygem-google-cloud-storage_transfer-gitlab>=1.2.0<1.3:net/rubygem-google-cloud-storage_transfer-gitlab \
@@ -343,8 +342,10 @@ GL_PROJECT= gitlab-foss
USE_RC_SUBR= gitlab
-SHEBANG_FILES= scripts/build_qa_image \
+SHEBANG_FILES= scripts/build_assets_image \
+ scripts/build_qa_image \
scripts/build_gdk_image \
+ scripts/compile_assets \
scripts/db_tasks \
scripts/rails-update-bisect \
scripts/frontend/codemods/vuex-to-pinia/migrate.sh \
@@ -355,7 +356,8 @@ SHEBANG_FILES= scripts/build_qa_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/bundler-checksum/test/project_with_checksum_lock/scripts/test \
+ vendor/gems/sidekiq/scripts/update-sidekiq.sh
CONFLICTS_INSTALL= gitolite \
gitolite2 \
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index 4389b899d794..24b9ef87d1fd 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,10 +1,14 @@
-GITLAB_VERSION= 17.10.4
-GITLAB_PORTREVISION= 1
+GITLAB_VERSION= 17.11.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.47.2
+GITLAB_GIT_VERSION= 2.49.0
# return something like x.yy
GITLAB_GIT_VERSION_SHORT= ${GITLAB_GIT_VERSION:C/^([0-9]*\.[0-9]*)\..*/\1/}
+# Overwrite version for gitlab-kas-grpc
+#GITLAB_KAS_GRPC_VERSION= ${GITLAB_VERSION}
+GITLAB_KAS_GRPC_VERSION= 17.11.0.pre.rc43
+
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index 1b27af89785a..f3f846cbf2ee 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1744259174
-SHA256 (gitlab-foss-v17.10.4.tar.bz2) = 136b41fd15714aaf230d59b9aceef0c912c70d342d9188f1014f360e4f4c7be5
-SIZE (gitlab-foss-v17.10.4.tar.bz2) = 128865018
-TIMESTAMP = 1744259233
-SHA256 (gitlab-v17.10.4-ee.tar.bz2) = f83a0846471958b40cf90f875cf173d940d604618a429cf1bd15fa484564635f
-SIZE (gitlab-v17.10.4-ee.tar.bz2) = 140282525
+TIMESTAMP = 1744950331
+SHA256 (gitlab-foss-v17.11.0.tar.bz2) = 5441ecd89caec2e9d91a6016c61c2b97d930714cc08bd7d4c4cc6e83f35ca256
+SIZE (gitlab-foss-v17.11.0.tar.bz2) = 129900742
+TIMESTAMP = 1744950332
+SHA256 (gitlab-v17.11.0-ee.tar.bz2) = 9bb12ae094f11dfc7358bd22536927695424a4fe96384cc8d25e0e33fe0449e1
+SIZE (gitlab-v17.11.0-ee.tar.bz2) = 144392613
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index e4317e6fb580..66fa089743a5 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,6 +1,6 @@
---- Gemfile.orig 2025-03-19 10:41:02 UTC
+--- Gemfile.orig 2025-04-16 04:05:48 UTC
+++ Gemfile
-@@ -164,8 +164,8 @@ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', fea
+@@ -168,8 +168,8 @@ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', fea
gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared
# GraphQL API
@@ -9,9 +9,9 @@
+gem 'graphql', '~> 2.4.11', path: 'vendor/gems/graphql', feature_category: :api
+#gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api
gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api
- gem 'graphlient', '~> 0.8.0', feature_category: :importers # Used by BulkImport feature (group::import)
-@@ -217,7 +217,7 @@ gem 'google-cloud-storage', '~> 1.45.0', feature_categ
+ # Cells
+@@ -220,7 +220,7 @@ gem 'google-cloud-storage', '~> 1.45.0', feature_categ
gem 'google-apis-storage_v1', '~> 0.29', feature_category: :shared
gem 'google-cloud-storage', '~> 1.45.0', feature_category: :shared
# We need >= 0.11.1 because that's when match_glob support is added to list_objects
@@ -20,7 +20,7 @@
gem 'google-apis-compute_v1', '~> 0.57.0', feature_category: :shared
gem 'google-apis-container_v1', '~> 0.43.0', feature_category: :shared
gem 'google-apis-container_v1beta1', '~> 0.43.0', feature_category: :shared
-@@ -228,7 +228,7 @@ gem 'google-apis-androidpublisher_v3', '~> 0.34.0', fe
+@@ -231,7 +231,7 @@ gem 'google-apis-androidpublisher_v3', '~> 0.34.0', fe
gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0', feature_category: :shared
gem 'google-apis-androidpublisher_v3', '~> 0.34.0', feature_category: :shared
@@ -29,7 +29,7 @@
gem 'google-cloud-artifact_registry-v1', '~> 0.11.0', feature_category: :shared
gem 'google-cloud-compute-v1', '~> 2.6.0', feature_category: :shared
-@@ -284,7 +284,7 @@ group :puma do
+@@ -287,7 +287,7 @@ group :puma do
gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base', feature_category: :shared
group :puma do
@@ -38,16 +38,16 @@
gem 'sd_notify', '~> 0.1.0', require: false, feature_category: :shared
end
-@@ -292,7 +292,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature
+@@ -295,7 +295,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature
gem 'state_machines-activerecord', '~> 0.8.0', feature_category: :shared
# Background jobs
--gem 'sidekiq', path: 'vendor/gems/sidekiq-7.2.4', require: 'sidekiq', feature_category: :scalability
-+gem 'sidekiq', '~> 7.2.4', require: 'sidekiq', feature_category: :scalability
+-gem 'sidekiq', path: 'vendor/gems/sidekiq', require: 'sidekiq', feature_category: :scalability
++gem 'sidekiq', '>= 7.3.9', require: 'sidekiq', feature_category: :scalability
gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability
gem 'gitlab-sidekiq-fetcher',
path: 'vendor/gems/sidekiq-reliable-fetch',
-@@ -430,7 +430,7 @@ gem 'snowplow-tracker', '~> 0.8.0', feature_category:
+@@ -433,7 +433,7 @@ gem 'snowplow-tracker', '~> 0.8.0', feature_category:
gem 'snowplow-tracker', '~> 0.8.0', feature_category: :product_analytics
# Metrics
@@ -56,7 +56,7 @@
gem 'prometheus-client-mmap', '~> 1.2.8', require: 'prometheus/client', feature_category: :shared
# Event-driven reactor for Ruby
-@@ -472,138 +472,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared
+@@ -475,140 +475,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared
gem 'warning', '~> 1.5.0', feature_category: :shared
@@ -106,11 +106,11 @@
- # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
- gem 'minitest', '~> 5.11.0', feature_category: :shared
-
-- gem 'spring', '~> 4.1.0', feature_category: :shared
+- gem 'spring', '~> 4.3.0', feature_category: :shared
- gem 'spring-commands-rspec', '~> 1.0.4', feature_category: :shared
-
- gem 'gitlab-styles', '~> 13.1.0', feature_category: :tooling, require: false
-- gem 'haml_lint', '~> 0.58', feature_category: :tooling
+- gem 'haml_lint', '~> 0.58', feature_category: :tooling, require: false
-
- # Benchmarking & profiling
- gem 'benchmark-ips', '~> 2.14.0', require: false, feature_category: :shared
@@ -139,6 +139,8 @@
- 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
-end
-
group :development, :test, :danger do
@@ -195,7 +197,7 @@
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
-@@ -638,16 +515,16 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside
+@@ -643,16 +518,16 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside
gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat
# Gitaly GRPC protocol definitions
@@ -215,7 +217,7 @@
gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared
-@@ -668,7 +545,7 @@ gem 'gitlab-net-dns', '~> 0.10.0', feature_category: :
+@@ -673,7 +548,7 @@ gem 'gitlab-net-dns', '~> 0.10.0', feature_category: :
gem 'gitlab-net-dns', '~> 0.10.0', feature_category: :shared
# Countries list
@@ -224,7 +226,7 @@
gem 'retriable', '~> 3.1.2', feature_category: :shared
-@@ -749,10 +626,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
+@@ -754,10 +629,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
gem 'duo_api', '~> 1.3', feature_category: :system_access
@@ -240,4 +242,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.0.0", require: 'gitlab/cloud_connector', feature_category: :cloud_connector
+ gem "gitlab-cloud-connector", "~> 1.5", require: 'gitlab/cloud_connector', feature_category: :cloud_connector
diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example
index a78db5ae4e8c..09cb658db5d2 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-03-19 10:41:02 UTC
+--- config/gitlab.yml.example.orig 2025-04-16 04:05:48 UTC
+++ config/gitlab.yml.example
-@@ -478,7 +478,7 @@ production: &base
+@@ -484,7 +484,7 @@ production: &base
## GitLab Pages
pages:
enabled: false
@@ -9,7 +9,7 @@
# The location where pages are stored (default: shared/pages).
# path: shared/pages
-@@ -488,9 +488,9 @@ production: &base
+@@ -494,9 +494,9 @@ production: &base
host: example.com
port: 80 # Set to 443 if you serve the pages with HTTPS
https: false # Set to true if you serve the pages with HTTPS
@@ -22,7 +22,7 @@
# File that contains the shared secret key for verifying access for gitlab-pages.
# Default is '.gitlab_pages_secret' relative to Rails.root (i.e. root of the GitLab app).
-@@ -1221,13 +1221,13 @@ production: &base
+@@ -1227,13 +1227,13 @@ production: &base
repositories:
storages: # You must have at least a `default` storage path.
default:
@@ -38,7 +38,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
-@@ -1262,12 +1262,12 @@ production: &base
+@@ -1268,12 +1268,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@@ -54,7 +54,7 @@
# Git over HTTP
upload_pack: true
-@@ -1282,7 +1282,7 @@ production: &base
+@@ -1288,7 +1288,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).
@@ -63,7 +63,7 @@
cell:
# enabled: false
-@@ -1300,7 +1300,7 @@ production: &base
+@@ -1306,7 +1306,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).
@@ -72,7 +72,7 @@
# The URL to the external KAS API (used by the Kubernetes agents)
# external_url: wss://kas.example.com
-@@ -1327,13 +1327,13 @@ production: &base
+@@ -1333,13 +1333,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
-@@ -1354,18 +1354,18 @@ production: &base
+@@ -1360,18 +1360,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:
-@@ -1592,13 +1592,13 @@ test:
+@@ -1598,13 +1598,13 @@ test:
gitaly_address: unix:tmp/tests/gitaly/praefect.socket
gitaly:
diff --git a/www/gitlab/pkg-message b/www/gitlab/pkg-message
index 4c0ce4714446..6428be5f3115 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/17.10-freebsd.md
+https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/install/17.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 17.9.x to 17.10.x, please follow the instructions in the guide at:
-https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/17.9-17.10-freebsd.md
+https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/17.10-17.11-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-09-06 22:09:55 +0000