aboutsummaryrefslogtreecommitdiff
path: root/www/gitlab
diff options
context:
space:
mode:
Diffstat (limited to 'www/gitlab')
-rw-r--r--www/gitlab/Makefile118
-rw-r--r--www/gitlab/Makefile.common12
-rw-r--r--www/gitlab/distinfo12
-rw-r--r--www/gitlab/files/patch-Gemfile55
-rw-r--r--www/gitlab/files/patch-bin_background__jobs20
-rw-r--r--www/gitlab/files/patch-config_gitlab.yml.example14
-rw-r--r--www/gitlab/files/patch-config_puma.rb.example8
-rw-r--r--www/gitlab/files/patch-vendor_gems_sidekiq_sidekiq.gemspec11
-rw-r--r--www/gitlab/pkg-message6
9 files changed, 139 insertions, 117 deletions
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index b0221087a911..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.7.0: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.2:devel/gitlab-shell \
+ gitlab-shell>=14.45.3:devel/gitlab-shell \
gitlab-workhorse>=${GITLAB_VERSION}:www/gitlab-workhorse \
- gitlab-zoekt-indexer>=1.2.0: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.0<4:security/rubygem-openssl \
- rubygem-gitlab-secret_detection>=0.33.0<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 \
@@ -60,24 +61,24 @@ 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.4<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>=2.1.3<3:security/rubygem-omniauth \
+ rubygem-omniauth-gl>=2.1.3<3:security/rubygem-omniauth-gl \
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 \
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>=2.0<3:security/rubygem-omniauth-shibboleth-redux \
+ 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 \
rubygem-openid_connect>=2.3.1<2.4:net/rubygem-openid_connect \
rubygem-omniauth-atlassian-oauth2>=0.2.0<0.3:security/rubygem-omniauth-atlassian-oauth2 \
@@ -92,11 +93,11 @@ 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.25<3:security/rubygem-acme-client-gitlab \
+ rubygem-acme-client-gitlab>=2.0.26<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.25<2.1.0:security/rubygem-gpgme \
- rubygem-gitlab_omniauth-ldap>=2.2.0<2.3.0:net/rubygem-gitlab_omniauth-ldap \
+ 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 \
@@ -106,32 +107,33 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-rack-cors>=2.0.1<2.1:www/rubygem-rack-cors \
rubygem-graphql>=2.5.11<2.6:devel/rubygem-graphql \
rubygem-apollo_upload_server>=2.1.6<2.2:net/rubygem-apollo_upload_server \
- rubygem-ffaker>=2.24.0<3:devel/rubygem-ffaker \
+ 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 \
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.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.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-cloudresourcemanager_v1-gitlab>=0.44.0<0.45:devel/rubygem-google-apis-cloudresourcemanager_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.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,15 +142,15 @@ 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 \
- rubygem-commonmarker0>=0.23.10<0.24:textproc/rubygem-commonmarker0 \
+ rubygem-commonmarker0>=0.23.12<0.24:textproc/rubygem-commonmarker0 \
rubygem-kramdown-gitlab>=2.5.1<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 \
@@ -158,35 +160,35 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-asciidoctor-include-ext>=0.4.0<0.5.0:textproc/rubygem-asciidoctor-include-ext \
rubygem-asciidoctor-plantuml00>=0.0.16<0.1:textproc/rubygem-asciidoctor-plantuml00 \
rubygem-asciidoctor-kroki>=0.10.0<0.11:textproc/rubygem-asciidoctor-kroki \
- rubygem-rouge-gitlab>=4.6.0<4.7:textproc/rubygem-rouge-gitlab \
+ 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.9<2:textproc/rubygem-nokogiri \
- rubygem-gitlab-glfm-markdown>=0.0.33<0.1:textproc/rubygem-gitlab-glfm-markdown \
+ rubygem-nokogiri>=1.18.10<2:textproc/rubygem-nokogiri \
+ 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.17,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-puma6>=6.6.1<6.6.2:www/rubygem-puma6 \
+ 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 \
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 \
- rubygem-re2>=2.19.0<3:devel/rubygem-re2 \
+ rubygem-re2>=2.20.0<3:devel/rubygem-re2 \
rubygem-semver_dialects>=3.7.0<4:devel/rubygem-semver_dialects \
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>=5.4.1<5.5:databases/rubygem-redis \
- rubygem-redis-client>=0.25.1<1:databases/rubygem-redis-client \
+ 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>=5.4.1<5.5:databases/rubygem-redis-clustering \
- rubygem-connection_pool>=2.5.3<2.6:net/rubygem-connection_pool \
+ 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 \
rubygem-atlassian-jwt>=0.2.1<0.3.0:www/rubygem-atlassian-jwt \
@@ -206,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.3.5<0.3.6: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.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 \
- 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.39.0<0.40: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 \
@@ -229,9 +231,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.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-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 \
@@ -273,25 +277,25 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-vmstat>=2.3.1<2.4.0:sysutils/rubygem-vmstat \
rubygem-sys-filesystem14>=1.4.3<1.5:sysutils/rubygem-sys-filesystem14 \
rubygem-net-ntp>0:net/rubygem-net-ntp \
- rubygem-ssh_data>=1.3<2:security/rubygem-ssh_data \
+ rubygem-ssh_data>=2.0<3: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.6.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-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 \
rubygem-flipper-active_record-rails-gitlab>=0.28.0<0.29:databases/rubygem-flipper-active_record-rails-gitlab \
rubygem-flipper-active_support_cache_store-rails-gitlab>=0.28.0<0.29:devel/rubygem-flipper-active_support_cache_store-rails-gitlab \
rubygem-unleash>=3.2.2<3.3:devel/rubygem-unleash \
- rubygem-gitlab-experiment>=0.9.1<0.10:devel/rubygem-gitlab-experiment \
+ rubygem-gitlab-experiment>=1.0.0<1.1:devel/rubygem-gitlab-experiment \
rubygem-lograge-rails-gitlab>=0.11.2<1.0:www/rubygem-lograge-rails-gitlab \
rubygem-grape_logging-gitlab>=1.8.4<2.0:devel/rubygem-grape_logging-gitlab \
rubygem-gitlab-net-dns>=0.15.0<0.16:dns/rubygem-gitlab-net-dns \
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 \
@@ -299,7 +303,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,20 +311,21 @@ 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-hashdiff>=1.2.0<1.3:devel/rubygem-hashdiff \
+ rubygem-devfile>=0.4.8<0.5:net/rubygem-devfile \
+ rubygem-hashdiff>=1.2.1<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 \
- 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.26<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 \
@@ -396,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 14856746f995..646a93dc3e95 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,5 +1,5 @@
-GITLAB_VERSION= 18.3.4
-GITLAB_PORTREVISION= 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
@@ -7,11 +7,13 @@ GITLAB_PORTREVISION= 1
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= 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 d96db7593374..341c68edb483 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1760008203
-SHA256 (gitlab-foss-v18.3.4.tar.bz2) = 7dc2674dd29204f3ad154cb90f31eb91b4549f78a4a45d32401faee70be76136
-SIZE (gitlab-foss-v18.3.4.tar.bz2) = 122267479
-TIMESTAMP = 1760008249
-SHA256 (gitlab-v18.3.4-ee.tar.bz2) = a7febfcce3f98d8cf46714631032b7f43c3df057a24d92491f6d57cc32b385da
-SIZE (gitlab-v18.3.4-ee.tar.bz2) = 138182651
+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 7943be7c3489..cfe5cabc50e5 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,6 +1,6 @@
---- Gemfile.orig 2025-08-20 06:43:08 UTC
+--- Gemfile.orig 2025-11-19 16:58:17 UTC
+++ Gemfile
-@@ -165,7 +165,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
-@@ -295,7 +295,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,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
+@@ -476,141 +476,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 'lefthook', '~> 1.13.0', require: false, 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
@@ -39,11 +40,11 @@
-
- gem 'listen', '~> 3.7', feature_category: :shared
-
-- gem 'ruby-lsp', "~> 0.23.0", require: false, feature_category: :tooling
+- gem 'ruby-lsp', "~> 0.26.0", require: false, feature_category: :tooling
-
-- gem 'ruby-lsp-rails', "~> 0.3.6", feature_category: :tooling
+- gem 'ruby-lsp-rails', "~> 0.4.8", feature_category: :tooling
-
-- gem 'ruby-lsp-rspec', "~> 0.1.10", require: false, feature_category: :tooling
+- gem 'ruby-lsp-rspec', "~> 0.1.27", require: false, feature_category: :tooling
-
- gem 'gdk-toogle', '~> 0.9', '>= 0.9.5', require: 'toogle', feature_category: :tooling
-
@@ -56,12 +57,12 @@
-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
-
-- gem 'awesome_print', require: false, feature_category: :shared
+- gem 'amazing_print', require: false, feature_category: :shared
-
- gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database
- gem 'rspec-rails', '~> 7.1.0', 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
@@ -114,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
-
@@ -161,26 +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.18.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
-@@ -643,10 +510,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
+@@ -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.2.0', feature_category: :deployment_management
-+gem 'gitlab-kas-grpc', '~> 18.2', feature_category: :deployment_management
+-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.74.0', feature_category: :shared
+ gem 'grpc', '~> 1.76.0', feature_category: :shared
-@@ -669,7 +536,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :
+@@ -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
@@ -189,7 +178,7 @@
gem 'retriable', '~> 3.1.2', feature_category: :shared
-@@ -750,10 +617,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
@@ -205,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-bin_background__jobs b/www/gitlab/files/patch-bin_background__jobs
index 552f9367a5ce..532332130faa 100644
--- a/www/gitlab/files/patch-bin_background__jobs
+++ b/www/gitlab/files/patch-bin_background__jobs
@@ -1,11 +1,23 @@
---- bin/background_jobs.orig 2021-12-01 10:42:56 UTC
+--- bin/background_jobs.orig 2025-10-21 19:12:22 UTC
+++ bin/background_jobs
-@@ -58,7 +58,7 @@ start_sidekiq()
+@@ -49,19 +49,14 @@ start_sidekiq()
+ start_sidekiq()
+ {
+ cmd="exec"
+- chpst=$(command -v chpst)
+
+- if [ -n "$chpst" ]; then
+- cmd="${cmd} ${chpst} -P"
+- fi
+-
+ # sidekiq-cluster expects an argument per process.
+ for (( i=1; i<=sidekiq_workers; i++ ))
+ do
processes_args+=("${sidekiq_queues}")
done
-- ${cmd} bin/sidekiq-cluster "${processes_args[@]}" -P $sidekiq_pidfile -e $RAILS_ENV "$@" 2>&1 | tee -a $sidekiq_logfile
-+ ${cmd} bin/sidekiq-cluster "${processes_args[@]}" -P $sidekiq_pidfile -e $RAILS_ENV "$@" 2>&1 >> $sidekiq_logfile
+- ${cmd} bin/sidekiq-cluster "${processes_args[@]}" -P "$sidekiq_pidfile" -e "$RAILS_ENV" "$@" 2>&1 | tee -a "$sidekiq_logfile"
++ ${cmd} bin/sidekiq-cluster "${processes_args[@]}" -P "$sidekiq_pidfile" -e "$RAILS_ENV" "$@" 2>&1 >> "$sidekiq_logfile"
}
cleanup()
diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example
index 5c05397684c9..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-08-20 06:43:08 UTC
+--- config/gitlab.yml.example.orig 2025-11-19 16:58:17 UTC
+++ config/gitlab.yml.example
-@@ -511,7 +511,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
-@@ -1261,13 +1261,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
-@@ -1302,12 +1302,12 @@ production: &base
+@@ -1294,12 +1294,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@@ -41,15 +41,15 @@
# Git over HTTP
upload_pack: true
-@@ -1322,7 +1322,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).
- # 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/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/files/patch-vendor_gems_sidekiq_sidekiq.gemspec b/www/gitlab/files/patch-vendor_gems_sidekiq_sidekiq.gemspec
new file mode 100644
index 000000000000..a66ec04e73f4
--- /dev/null
+++ b/www/gitlab/files/patch-vendor_gems_sidekiq_sidekiq.gemspec
@@ -0,0 +1,11 @@
+--- vendor/gems/sidekiq/sidekiq.gemspec.orig 2025-11-03 12:17:46 UTC
++++ vendor/gems/sidekiq/sidekiq.gemspec
+@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
+ gem.homepage = "https://sidekiq.org"
+ gem.license = "LGPL-3.0"
+
+- gem.executables = ["sidekiq", "sidekiqmon"]
++ #gem.executables = ["sidekiq", "sidekiqmon"]
+ gem.files = %w[
+ sidekiq.gemspec
+ README.md
diff --git a/www/gitlab/pkg-message b/www/gitlab/pkg-message
index 089734612436..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.3-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.2.x to 18.3.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.2-18.3-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-26 12:27:38 +0000