aboutsummaryrefslogtreecommitdiff
path: root/www/gitlab
diff options
context:
space:
mode:
Diffstat (limited to 'www/gitlab')
-rw-r--r--www/gitlab/Makefile48
-rw-r--r--www/gitlab/Makefile.common11
-rw-r--r--www/gitlab/distinfo12
-rw-r--r--www/gitlab/files/patch-Gemfile34
-rw-r--r--www/gitlab/files/patch-config_gitlab.yml.example10
-rw-r--r--www/gitlab/files/patch-config_puma.rb.example8
-rw-r--r--www/gitlab/pkg-message6
7 files changed, 67 insertions, 62 deletions
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index 9f1d2ba74b69..cf17c23d70a0 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -29,27 +29,28 @@ 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.9.4:textproc/gitlab-elasticsearch-indexer \
+ gitlab-elasticsearch-indexer>=5.10.1:textproc/gitlab-elasticsearch-indexer \
gitlab-agent>=${GITLAB_VERSION}:net/gitlab-agent \
gitlab-pages>=${GITLAB_VERSION}:www/gitlab-pages \
gitlab-shell>=14.45.3:devel/gitlab-shell \
gitlab-workhorse>=${GITLAB_VERSION}:www/gitlab-workhorse \
- gitlab-zoekt-indexer>=1.6.2:textproc/gitlab-zoekt-indexer \
+ gitlab-zoekt-indexer>=1.7.6: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.9.0:devel/rubygem-parser \
+ rubygem-parser>=3.3.10.0:devel/rubygem-parser \
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>=7.1.5.1<7.2:www/rubygem-rails-gitlab \
+ rubygem-rails-gitlab>=${RAILS_VERSION}<7.2:www/rubygem-rails-gitlab \
+ rubygem-zeitwerk>=2.6.18<2.6.19:devel/rubygem-zeitwerk \
rubygem-mutex_m>=0.3<1:devel/rubygem-mutex_m \
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.3.1<4:security/rubygem-openssl \
- rubygem-gitlab-secret_detection>=0.35.1<1:security/rubygem-gitlab-secret_detection \
+ rubygem-openssl>=3.3.2<3.4:security/rubygem-openssl \
+ rubygem-gitlab-secret_detection>=0.38.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 \
@@ -75,7 +76,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.1<2:net/rubygem-omniauth-google-oauth2-gitlab \
+ rubygem-omniauth-google-oauth2-gitlab>=1.2.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-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 \
@@ -109,7 +110,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-ffaker>=2.25.0<3:devel/rubygem-ffaker \
rubygem-hashie>=5.0.0<5.1:devel/rubygem-hashie \
rubygem-kaminari-rails-gitlab>=1.2.2<1.3:www/rubygem-kaminari-rails-gitlab \
- rubygem-hamlit>=3.0.3<3.1:www/rubygem-hamlit \
+ rubygem-hamlit-gitlab>=3.0.3<3.1:www/rubygem-hamlit-gitlab \
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 \
@@ -129,7 +130,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-google-apis-container_v1beta1>=0.91.0<0.92: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.44.0<0.45: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-iam_v1-gitlab>=0.79.0<0.80: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.86.0<0.87:devel/rubygem-google-apis-androidpublisher_v3-gitlab \
@@ -162,12 +163,12 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-rouge-gitlab>=4.6.1<4.7:textproc/rubygem-rouge-gitlab \
rubygem-truncato>=0.7.13<0.8.0:textproc/rubygem-truncato \
rubygem-nokogiri>=1.18.10<2:textproc/rubygem-nokogiri \
- rubygem-gitlab-glfm-markdown>=0.0.36<0.1:textproc/rubygem-gitlab-glfm-markdown \
+ rubygem-gitlab-glfm-markdown>=0.0.38<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-gitlab>=2.10.3<2.11:devel/rubygem-icalendar-gitlab \
rubygem-diffy>=3.4.4<4:textproc/rubygem-diffy \
- rubygem-rack22>=2.2.18,3<2.3,3:www/rubygem-rack22 \
+ rubygem-rack22>=2.2.20,3<2.3,3:www/rubygem-rack22 \
rubygem-rack-timeout>=0.7.0<0.8:www/rubygem-rack-timeout \
rubygem-puma-gitlab>=6.6.1<6.6.2:www/rubygem-puma-gitlab \
rubygem-sd_notify>=0.1.1<0.2:devel/rubygem-sd_notify \
@@ -183,10 +184,10 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-version_sorter>=2.3<3:textproc/rubygem-version_sorter \
rubygem-js_regex>=3.13.0<4.0:textproc/rubygem-js_regex \
rubygem-device_detector>=1.1.3:devel/rubygem-device_detector \
- rubygem-redis-gitlab>=5.4.0<5.4.1:databases/rubygem-redis-gitlab \
+ rubygem-redis-gitlab>=5.4.1<5.5:databases/rubygem-redis-gitlab \
rubygem-redis-client>=0.26.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-redis-clustering-gitlab>=5.4.1<5.5:databases/rubygem-redis-clustering-gitlab \
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 \
@@ -207,19 +208,19 @@ 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.8.0<0.9:databases/rubygem-click_house-client \
+ rubygem-click_house-client>=0.8.2<0.9:databases/rubygem-click_house-client \
rubygem-addressable>=2.8<3:www/rubygem-addressable \
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 \
- rubygem-rack-attack>=6.7.0<6.8:www/rubygem-rack-attack \
+ rubygem-rack-attack>=6.8.0<6.9:www/rubygem-rack-attack \
rubygem-sentry-ruby>=5.23.0<5.24:devel/rubygem-sentry-ruby \
rubygem-sentry-rails>=5.23.0<5.24:devel/rubygem-sentry-rails \
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.42.0<0.43:devel/rubygem-gitlab-labkit \
+ rubygem-gitlab-labkit>=0.42.2<0.43: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 \
@@ -278,9 +279,9 @@ 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.4.1:net/rubygem-gitaly \
+ rubygem-gitaly>=18.6.0:net/rubygem-gitaly \
rubygem-gitlab-kas-grpc>=${GITLAB_KAS_GRPC_VERSION}:net/rubygem-gitlab-kas-grpc \
- rubygem-grpc-gitlab>=1.75.0<1.76:net/rubygem-grpc-gitlab \
+ rubygem-grpc-gitlab>=1.76.0<1.77:net/rubygem-grpc-gitlab \
rubygem-google-protobuf3>=3.25.8<4:devel/rubygem-google-protobuf3 \
rubygem-toml-rb>=2.2.0<3:www/rubygem-toml-rb \
rubygem-flipper-gitlab>=0.28.0<0.29:devel/rubygem-flipper-gitlab \
@@ -294,7 +295,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-countries>=4.1.3<4.2.0:devel/rubygem-countries \
rubygem-retriable>=3.1.2<3.2.0:devel/rubygem-retriable \
rubygem-lru_redux>0:devel/rubygem-lru_redux \
- rubygem-mail>=2.8.1<2.8.2,2:mail/rubygem-mail \
+ rubygem-mail-gitlab>=2.9.0<2.9.1:mail/rubygem-mail-gitlab \
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 \
@@ -318,13 +319,13 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
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 \
- rubygem-uri-gitlab>=0.13.2<0.13.3:net/rubygem-uri-gitlab \
+ rubygem-net-http-gitlab>=0.6.0<0.6.1:www/rubygem-net-http-gitlab \
+ rubygem-uri-gitlab>=0.13.3<0.13.4:net/rubygem-uri-gitlab \
rubygem-duo_api>=1.4<2:security/rubygem-duo_api \
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.33<2:security/rubygem-gitlab-cloud-connector \
+ rubygem-gitlab-cloud-connector>=1.35<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 \
@@ -400,6 +401,9 @@ post-patch:
# Remove symlink a create a file with content
${RM} ${WRKSRC}/GITLAB_WORKHORSE_VERSION
${ECHO} ${PORTVERSION} > ${WRKSRC}/GITLAB_WORKHORSE_VERSION
+ # Correct link for pipeline secret scanning tool
+ ${REINPLACE_CMD} -e 's|/analyzer run|/usr/local/bin/analyzer run|g' \
+ ${WRKSRC}/lib/gitlab/ci/templates/Jobs/*.yml
do-install:
${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index 17873ac384d6..646a93dc3e95 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,18 +1,19 @@
-GITLAB_VERSION= 18.5.1
+GITLAB_VERSION= 18.6.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.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/}
+GITLAB_GIT_MASTER_VERSION= 419c72cb8ada252b260efc38ff91fe201de7c8c3
+GITLAB_GIT_PREV_VERSION= 23466173824c0a0f835c0d790c2f38156ae6284a
# Overwrite version for gitlab-kas-grpc
-GITLAB_KAS_GRPC_VERSION= ${GITLAB_VERSION}
-#GITLAB_KAS_GRPC_VERSION= 18.2.1
+#GITLAB_KAS_GRPC_VERSION= ${GITLAB_VERSION}
+GITLAB_KAS_GRPC_VERSION= 18.5.2
# Rails version
-RAILS_VERSION= 7.1.5.2
+RAILS_VERSION= 7.1.6
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index 45bec2af3123..341c68edb483 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1761544051
-SHA256 (gitlab-foss-v18.5.1.tar.bz2) = 50f60927372f380930fc6a6b5b9bf3093c6b043ad488b8e5b941a8ca5bec5c91
-SIZE (gitlab-foss-v18.5.1.tar.bz2) = 122919401
-TIMESTAMP = 1761544091
-SHA256 (gitlab-v18.5.1-ee.tar.bz2) = e272ef2b363f2d5ba20b3a01eac3f17c07a193dbb453613d139a9400cb600e72
-SIZE (gitlab-v18.5.1-ee.tar.bz2) = 139335454
+TIMESTAMP = 1763647030
+SHA256 (gitlab-foss-v18.6.0.tar.bz2) = 2a7891b1347e730d26dbe6acf3dd7197a289694e3aa0d1bc2af6e5c6b322cc55
+SIZE (gitlab-foss-v18.6.0.tar.bz2) = 126821552
+TIMESTAMP = 1763647031
+SHA256 (gitlab-v18.6.0-ee.tar.bz2) = d1d07dcd0f79b244cf3d7d1acb5bd1b29d1dcc4aae3d11f932df8a51f62135fb
+SIZE (gitlab-v18.6.0-ee.tar.bz2) = 143690179
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index d221500c3dda..cfe5cabc50e5 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,6 +1,6 @@
---- Gemfile.orig 2025-10-21 19:12:22 UTC
+--- Gemfile.orig 2025-11-19 16:58:17 UTC
+++ Gemfile
-@@ -166,7 +166,7 @@ gem 'graphql', '2.5.11', feature_category: :api
+@@ -169,7 +169,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
-@@ -296,7 +296,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature
+@@ -299,7 +299,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature
gem 'state_machines-activerecord', '~> 0.8.0', feature_category: :shared
# Background jobs
@@ -18,7 +18,7 @@
gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability
gem 'gitlab-sidekiq-fetcher',
path: 'vendor/gems/sidekiq-reliable-fetch',
-@@ -474,141 +474,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared
+@@ -476,141 +476,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared
gem 'warning', '~> 1.5.0', feature_category: :shared
@@ -57,7 +57,7 @@
-group :development, :test do
- gem 'deprecation_toolkit', '~> 2.2.3', require: false, feature_category: :shared
- gem 'bullet', '~> 8.0.0', feature_category: :shared
-- gem 'parser', '= 3.3.9.0', feature_category: :shared
+- gem 'parser', '= 3.3.10.0', feature_category: :shared
- gem 'pry-byebug', feature_category: :shared
- gem 'pry-rails', '~> 0.3.9', feature_category: :shared
- gem 'pry-shell', '~> 0.6.4', feature_category: :shared
@@ -107,7 +107,7 @@
-group :development, :test, :coverage do
- 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 'simplecov-cobertura', '~> 3.1.0', require: false, feature_category: :tooling
- gem 'undercover', '~> 0.7.0', require: false, feature_category: :tooling
-end
-
@@ -154,22 +154,22 @@
- # 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.20.0', require: false, feature_category: :tooling
+- gem 'gitlab_quality-test_tooling', '~> 2.26.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 +516,7 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside
- gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat
-
- # Gitaly GRPC protocol definitions
--gem 'gitaly', '~> 18.4.0.pre.rc1', feature_category: :gitaly
-+gem 'gitaly', '~> 18.4', feature_category: :gitaly
+@@ -647,7 +521,7 @@ gem 'gitaly', '~> 18.6.0.pre.rc1', feature_category: :
+ gem 'gitaly', '~> 18.6.0.pre.rc1', feature_category: :gitaly
# KAS GRPC protocol definitions
- gem 'gitlab-kas-grpc', '~> 18.5.0-rc4', feature_category: :deployment_management
-@@ -668,7 +542,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :
+-gem 'gitlab-kas-grpc', '~> 18.5.0-rc4', feature_category: :deployment_management
++gem 'gitlab-kas-grpc', '~> 18.5.2', feature_category: :deployment_management
+
+ gem 'grpc', '~> 1.76.0', feature_category: :shared
+
+@@ -670,7 +544,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :
gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :shared
# Countries list
@@ -178,7 +178,7 @@
gem 'retriable', '~> 3.1.2', feature_category: :shared
-@@ -753,10 +627,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
+@@ -755,10 +629,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
gem 'duo_api', '~> 1.3', feature_category: :system_access
@@ -194,4 +194,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.26", require: 'gitlab/cloud_connector', feature_category: :plan_provisioning
+ gem "gitlab-cloud-connector", "~> 1.35", 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 d4e98d985eb3..fae18cb60868 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-10-21 19:24:47 UTC
+--- config/gitlab.yml.example.orig 2025-11-19 16:58:17 UTC
+++ config/gitlab.yml.example
-@@ -507,7 +507,7 @@ production: &base
+@@ -508,7 +508,7 @@ production: &base
## GitLab Pages
pages:
enabled: false
@@ -9,7 +9,7 @@
# The location where pages are stored (default: shared/pages).
# path: shared/pages
-@@ -1252,13 +1252,13 @@ production: &base
+@@ -1253,13 +1253,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
-@@ -1293,12 +1293,12 @@ production: &base
+@@ -1294,12 +1294,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@@ -41,7 +41,7 @@
# Git over HTTP
upload_pack: true
-@@ -1313,7 +1313,7 @@ production: &base
+@@ -1314,7 +1314,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).
diff --git a/www/gitlab/files/patch-config_puma.rb.example b/www/gitlab/files/patch-config_puma.rb.example
index b3218c5ffa71..aa031d5fd82c 100644
--- a/www/gitlab/files/patch-config_puma.rb.example
+++ b/www/gitlab/files/patch-config_puma.rb.example
@@ -1,4 +1,4 @@
---- config/puma.rb.example.orig 2025-01-22 04:13:11 UTC
+--- config/puma.rb.example.orig 2025-11-19 16:58:17 UTC
+++ config/puma.rb.example
@@ -1,15 +1,20 @@
# frozen_string_literal: true
@@ -37,9 +37,9 @@
-require_relative "/home/git/gitlab/lib/gitlab/cluster/lifecycle_events"
+require_relative "%%WWWDIR%%/lib/gitlab/cluster/lifecycle_events"
- on_restart do
- # Signal application hooks that we're about to restart
-@@ -74,14 +79,14 @@ wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LES
+ if Gem::Version.new(Puma::Const::PUMA_VERSION) < Gem::Version.new('7.0')
+ Gitlab::Cluster::LifecycleEvents.set_puma_options @config.options
+@@ -94,14 +99,14 @@ wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LES
wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f
# Use json formatter
diff --git a/www/gitlab/pkg-message b/www/gitlab/pkg-message
index c11311173fd9..44d60ee23e86 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.5-freebsd.md
+https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/install/18.6-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.4.x to 18.5.x, please follow the instructions in the guide at:
+switched from 18.5.x to 18.6.x, please follow the instructions in the guide at:
-https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/18.4-18.5-freebsd.md
+https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/18.5-18.6-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-23 13:04:25 +0000