summaryrefslogtreecommitdiff
path: root/www/gitlab
diff options
context:
space:
mode:
Diffstat (limited to 'www/gitlab')
-rw-r--r--www/gitlab/Makefile117
-rw-r--r--www/gitlab/Makefile.common8
-rw-r--r--www/gitlab/distinfo12
-rw-r--r--www/gitlab/files/patch-Gemfile71
-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.gemspec11
-rw-r--r--www/gitlab/pkg-message6
9 files changed, 116 insertions, 142 deletions
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index 8db1cc48aeb4..1e8c0f37dd1e 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -29,33 +29,34 @@ 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.44.0:devel/gitlab-shell \
gitlab-workhorse>=${GITLAB_VERSION}:www/gitlab-workhorse \
+ gitlab-zoekt-indexer>=1.2.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 \
bash>0:shells/bash \
- rubygem-parser>=3.3.7.1:devel/rubygem-parser \
+ rubygem-parser>=3.3.9.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-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 \
+ rubygem-pg-gitlab>=1.6.1<1.7:databases/rubygem-pg-gitlab \
rubygem-rugged>=1.6<2:devel/rubygem-rugged \
- rubygem-faraday-gitlab>=2.13.1<3:www/rubygem-faraday-gitlab \
+ rubygem-faraday-gitlab>=2.13.4<3:www/rubygem-faraday-gitlab \
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 \
@@ -68,8 +69,8 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
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<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-saml-gitlab>=2.2.4<3:security/rubygem-omniauth-saml-gitlab \
+ 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 \
@@ -81,20 +82,20 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
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 \
rubygem-rack-oauth2-gitlab>=2.2.1<2.3:security/rubygem-rack-oauth2-gitlab \
- rubygem-jwt>=2.9.3<3:www/rubygem-jwt \
+ rubygem-jwt>=2.10.2<2.11:www/rubygem-jwt \
rubygem-gssapi>=1.3.1<1.4:security/rubygem-gssapi \
rubygem-recaptcha>=5.12<6.0:devel/rubygem-recaptcha \
rubygem-akismet>=3.0<4.0:devel/rubygem-akismet \
- rubygem-invisible_captcha>=2.1.0<2.2.0:graphics/rubygem-invisible_captcha \
+ rubygem-invisible_captcha>=2.3.0<2.4:graphics/rubygem-invisible_captcha \
rubygem-devise-two-factor-rails-gitlab>=4.1.1<4.2:security/rubygem-devise-two-factor-rails-gitlab \
rubygem-rqrcode-gitlab>=2.2.0<3:www/rubygem-rqrcode-gitlab \
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.25<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 \
+ 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-net-ldap017>=0.17.1<0.18:net/rubygem-net-ldap017 \
rubygem-grape20>=2.0.0<2.1:devel/rubygem-grape20 \
@@ -103,17 +104,17 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-grape-swagger-entity>=0.5.5<0.6:devel/rubygem-grape-swagger-entity \
rubygem-grape-path-helpers>=2.0.1<2.1:devel/rubygem-grape-path-helpers \
rubygem-rack-cors>=2.0.1<2.1:www/rubygem-rack-cors \
- rubygem-graphql>=2.4.13<2.5:devel/rubygem-graphql \
+ 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-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>=2.15.0<2.16:www/rubygem-hamlit \
+ rubygem-hamlit>=3.0.3<3.1:www/rubygem-hamlit \
rubygem-carrierwave-gitlab>=1.3.4<2.0:www/rubygem-carrierwave-gitlab \
rubygem-mini_magick4>=4.12<5:graphics/rubygem-mini_magick4 \
rubygem-prawn>=0:print/rubygem-prawn \
rubygem-prawn-svg>=0:print/rubygem-prawn-svg \
- rubygem-fog-aws-gitlab>=3.26<4:net/rubygem-fog-aws-gitlab \
+ 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-local-gitlab>=0.8<1.0:net/rubygem-fog-local-gitlab \
@@ -121,26 +122,26 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-gitlab-fog-azure-rm>=2.2.0<2.3: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-apis-core-gitlab>=0.11.2<2:devel/rubygem-google-apis-core-gitlab \
- rubygem-google-apis-compute_v1-gitlab>=0.57.0<0.58:devel/rubygem-google-apis-compute_v1-gitlab \
- rubygem-google-apis-container_v1>=0.43.0<0.44:devel/rubygem-google-apis-container_v1 \
+ 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-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-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.36.0<0.37:devel/rubygem-google-apis-iam_v1-gitlab \
+ rubygem-google-apis-iam_v1-gitlab>=0.73.0<0.74:devel/rubygem-google-apis-iam_v1-gitlab \
rubygem-google-apis-serviceusage_v1>=0.28.0<0.29:devel/rubygem-google-apis-serviceusage_v1 \
rubygem-google-apis-sqladmin_v1beta4-gitlab>=0.41.0<0.42:devel/rubygem-google-apis-sqladmin_v1beta4-gitlab \
- rubygem-google-apis-androidpublisher_v3-gitlab>=0.34.0<0.35:devel/rubygem-google-apis-androidpublisher_v3-gitlab \
- rubygem-googleauth-gitlab>=1.8.1<2:security/rubygem-googleauth-gitlab \
+ rubygem-google-apis-androidpublisher_v3-gitlab>=0.84.0<0.85: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 \
rubygem-seed-fu-gitlab>=2.3.9<2.4.0:databases/rubygem-seed-fu-gitlab \
rubygem-elasticsearch-model-gitlab>=7.2<8:textproc/rubygem-elasticsearch-model-gitlab \
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-s3-gitlab>=1.189.0<1.190:devel/rubygem-aws-sdk-s3-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-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-typhoeus>=1.4.0<1.5:www/rubygem-typhoeus \
@@ -157,17 +158,17 @@ 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.5.2<4.6:textproc/rubygem-rouge-gitlab \
+ rubygem-rouge-gitlab>=4.6.0<4.7:textproc/rubygem-rouge-gitlab \
rubygem-truncato>=0.7.13<0.8.0:textproc/rubygem-truncato \
- rubygem-nokogiri>=1.18.7<2:textproc/rubygem-nokogiri \
- rubygem-gitlab-glfm-markdown>=0.0.31<0.1:textproc/rubygem-gitlab-glfm-markdown \
+ rubygem-nokogiri>=1.18.9<2:textproc/rubygem-nokogiri \
+ rubygem-gitlab-glfm-markdown>=0.0.33<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.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-puma>=6.6.1<6.6.2:www/rubygem-puma \
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 \
@@ -176,20 +177,21 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
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.15.0<3:devel/rubygem-re2 \
+ rubygem-re2>=2.19.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.8<4.0:textproc/rubygem-js_regex \
+ 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.0<5.5:databases/rubygem-redis \
- rubygem-redis-clustering>=5.4.0<5.5:databases/rubygem-redis-clustering \
+ rubygem-redis>=5.4.1<5.5:databases/rubygem-redis \
+ rubygem-redis-client>=0.25.1<1:databases/rubygem-redis-client \
+ rubygem-redis-cluster-client>=0.13.5<1:databases/rubygem-redis-cluster-client \
+ rubygem-redis-clustering>=5.4.1<5.5:databases/rubygem-redis-clustering \
rubygem-connection_pool>=2.5.3<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 \
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-kubeclient>=4.12.0<4.13.0:www/rubygem-kubeclient \
rubygem-ruby-openai37>=3.7<4:www/rubygem-ruby-openai37 \
rubygem-circuitbox>=2.0.0<2.1:www/rubygem-circuitbox \
rubygem-sanitize60>=6.0.2<6.1:textproc/rubygem-sanitize60 \
@@ -204,6 +206,7 @@ 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-addressable>=2.8<3:www/rubygem-addressable \
rubygem-gon-rails-gitlab>=6.4.0<6.5:www/rubygem-gon-rails-gitlab \
rubygem-request_store>=1.7.0<1.8:devel/rubygem-request_store \
@@ -215,8 +218,8 @@ 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-thrift>=0.16.0:devel/rubygem-thrift \
+ rubygem-gitlab-labkit>=0.39.0<0.40: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 \
rubygem-gettext>=3.5.1<4:devel/rubygem-gettext \
@@ -227,7 +230,8 @@ 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-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-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 \
@@ -253,18 +257,17 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-opentelemetry-instrumentation-sidekiq>=0.25.7:devel/rubygem-opentelemetry-instrumentation-sidekiq \
rubygem-warning>=1.5.0<1.6:devel/rubygem-warning \
rubygem-git>=1.19.1<2:devel/rubygem-git \
- rubygem-gitlab-dangerfiles>=4.9.2<4.10:devel/rubygem-gitlab-dangerfiles \
+ rubygem-gitlab-dangerfiles>=4.10.0<4.11:devel/rubygem-gitlab-dangerfiles \
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-html2text>=0.4.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-memory_profiler>=1.0<2.0:devel/rubygem-memory_profiler \
- rubygem-activerecord-explain-analyze>=0.1<1.0:databases/rubygem-activerecord-explain-analyze \
+ rubygem-rbtrace>=0.5.2<1.0:devel/rubygem-rbtrace \
+ rubygem-memory_profiler>=1.1.0<2.0:devel/rubygem-memory_profiler \
rubygem-oauth2-gitlab>=2.0.10<3:net/rubygem-oauth2-gitlab \
rubygem-health_check-rails-gitlab>=3.0<4:devel/rubygem-health_check-rails-gitlab \
rubygem-vmstat>=2.3.1<2.4.0:sysutils/rubygem-vmstat \
@@ -272,9 +275,9 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-net-ntp>0:net/rubygem-net-ntp \
rubygem-ssh_data>=1.3<2:security/rubygem-ssh_data \
rubygem-spamcheck>=1.3.3<1.4:net/rubygem-spamcheck \
- rubygem-gitaly>=18.1.0:net/rubygem-gitaly \
+ rubygem-gitaly>=18.2.1:net/rubygem-gitaly \
rubygem-gitlab-kas-grpc>=${GITLAB_KAS_GRPC_VERSION}:net/rubygem-gitlab-kas-grpc \
- rubygem-grpc-gitlab>=1.72.0<2:net/rubygem-grpc-gitlab \
+ rubygem-grpc-gitlab>=1.74.0<2: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 \
@@ -284,15 +287,15 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-gitlab-experiment>=0.9.1<0.10: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.12.0<0.13:dns/rubygem-gitlab-net-dns \
+ 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-lockbox>=1.3.0<1.4:security/rubygem-lockbox \
+ 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 \
- rubygem-json-gitlab>=2.11.2<2.12:devel/rubygem-json-gitlab \
+ rubygem-json>=2.13.1<2.14:devel/rubygem-json \
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 \
@@ -305,10 +308,11 @@ 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 \
- rubygem-net-protocol01>=0.1.3<0.2:net/rubygem-net-protocol01 \
+ 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 \
@@ -316,7 +320,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.26<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 +349,9 @@ 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/aigw-tagging.sh \
+ scripts/build_assets_image \
scripts/build_qa_image \
scripts/build_gdk_image \
scripts/compile_assets \
@@ -359,7 +365,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 0a2db91e5613..b5a9461467e0 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,17 +1,17 @@
-GITLAB_VERSION= 18.1.0
+GITLAB_VERSION= 18.3.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/}
# Overwrite version for gitlab-kas-grpc
GITLAB_KAS_GRPC_VERSION= ${GITLAB_VERSION}
-#GITLAB_KAS_GRPC_VERSION= 17.11.0.pre.rc43
+#GITLAB_KAS_GRPC_VERSION= 18.2.1
# Rails version
-RAILS_VERSION= 7.1.5.1
+RAILS_VERSION= 7.1.5.2
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index c22284f466a6..591cf63d11d6 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1750221061
-SHA256 (gitlab-foss-v18.1.0.tar.bz2) = 5c909d712494ff50ab1a15abef760388fea062fbb9204e54d0fcf5a28402dbb6
-SIZE (gitlab-foss-v18.1.0.tar.bz2) = 119446403
-TIMESTAMP = 1750221102
-SHA256 (gitlab-v18.1.0-ee.tar.bz2) = 7523f6c04af6a12b682caeca401b7eea80b63e8ec84fdd4e94a886563f81ffe3
-SIZE (gitlab-v18.1.0-ee.tar.bz2) = 134734522
+TIMESTAMP = 1755673899
+SHA256 (gitlab-foss-v18.3.0.tar.bz2) = 6e41dcfac151ec18d8b6896823499a73fc45e026d3804798fdb73b5c5c51c332
+SIZE (gitlab-foss-v18.3.0.tar.bz2) = 122196697
+TIMESTAMP = 1755673938
+SHA256 (gitlab-v18.3.0-ee.tar.bz2) = 03f1e46a1afdbbb3ef7a3ce514afd0d267c20df52e8be9a7be8a7f51c4dd497f
+SIZE (gitlab-v18.3.0-ee.tar.bz2) = 138127084
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index 704da6697d22..7943be7c3489 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,34 +1,14 @@
---- Gemfile.orig 2025-06-18 04:18:20 UTC
+--- Gemfile.orig 2025-08-20 06:43:08 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
+@@ -165,7 +165,7 @@ gem 'graphql', '2.5.11', feature_category: :api
# GraphQL API
--gem 'graphql', '2.4.13', feature_category: :api
--gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api
-+gem 'graphql', '~> 2.4.13', feature_category: :api
-+#gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api
+ gem 'graphql', '2.5.11', feature_category: :api
+-gem 'graphql-docs', '~> 5.2.0', group: [:development, :test], feature_category: :api
++#gem 'graphql-docs', '~> 5.2.0', group: [:development, :test], feature_category: :api
gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api
# 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
--gem 'google-apis-core', '~> 0.11.0', '>= 0.11.1', feature_category: :shared
-+gem 'google-apis-core', '~> 0.11', '>= 0.11.1', feature_category: :shared
- 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
-@@ -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
-
--gem 'googleauth', '~> 1.8.1', feature_category: :shared
-+gem 'googleauth', '~> 1.8', feature_category: :shared
- gem 'google-cloud-artifact_registry-v1', '~> 0.11.0', feature_category: :shared
- gem 'google-cloud-compute-v1', '~> 2.6.0', feature_category: :shared
-
@@ -295,7 +295,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature
gem 'state_machines-activerecord', '~> 0.8.0', feature_category: :shared
@@ -38,12 +18,12 @@
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
+@@ -468,148 +468,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared
gem 'warning', '~> 1.5.0', feature_category: :shared
-group :development do
-- gem 'lefthook', '~> 1.11.0', require: false, feature_category: :tooling
+- gem 'lefthook', '~> 1.12.0', require: false, feature_category: :tooling
- gem 'rubocop', feature_category: :tooling
-
- gem 'solargraph', '~> 0.54.0', require: false, feature_category: :shared
@@ -76,7 +56,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.8.0', feature_category: :shared
+- gem 'parser', '= 3.3.9.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
@@ -85,7 +65,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
@@ -128,14 +108,14 @@
-end
-
group :development, :test, :danger do
- gem 'gitlab-dangerfiles', '~> 4.9.0', require: false, feature_category: :tooling
+ gem 'gitlab-dangerfiles', '~> 4.10.0', require: false, feature_category: :tooling
end
-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 '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
@@ -162,6 +142,11 @@
-
- gem 'graphlyte', '~> 1.0.0', feature_category: :shared
-
+- # Upload CI metrics to a GCP BigQuery instance
+- #
+- # We only use this gem in CI.
+- gem 'google-cloud-bigquery', '~> 1.0', feature_category: :tooling
+-
- gem 'shoulda-matchers', '~> 6.4.0', require: false, feature_category: :shared
- gem 'email_spec', '~> 2.3.0', feature_category: :shared
- gem 'webmock', '~> 3.25.0', feature_category: :shared
@@ -176,23 +161,27 @@
- # 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.10.0', require: false, feature_category: :tooling
+- gem 'gitlab_quality-test_tooling', '~> 2.18.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
-@@ -646,7 +518,7 @@ gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :
- gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :gitaly
+@@ -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
# 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.2.0', feature_category: :deployment_management
++gem 'gitlab-kas-grpc', '~> 18.2', feature_category: :deployment_management
- gem 'grpc', '~> 1.72.0', feature_category: :shared
+ gem 'grpc', '~> 1.74.0', feature_category: :shared
-@@ -669,7 +541,7 @@ gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :
- gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :shared
+@@ -669,7 +536,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :
+ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :shared
# Countries list
-gem 'countries', '~> 4.0.0', feature_category: :shared
@@ -200,7 +189,7 @@
gem 'retriable', '~> 3.1.2', feature_category: :shared
-@@ -750,10 +622,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
+@@ -750,10 +617,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
gem 'duo_api', '~> 1.3', feature_category: :system_access
@@ -216,4 +205,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.26", 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..5c05397684c9 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-08-20 06:43:08 UTC
+++ config/gitlab.yml.example
-@@ -493,7 +493,7 @@ production: &base
+@@ -511,7 +511,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
+@@ -1261,13 +1261,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
+@@ -1302,12 +1302,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@@ -41,7 +41,7 @@
# Git over HTTP
upload_pack: true
-@@ -1299,7 +1299,7 @@ production: &base
+@@ -1322,7 +1322,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
+@@ -1340,7 +1340,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
+@@ -1367,13 +1367,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
+@@ -1394,18 +1394,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:
+@@ -1632,13 +1632,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..71b3d3dbd4e4 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,14 +1,5 @@
---- 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-08-20 06:43:08 UTC
+++ gems/gitlab-backup-cli/gitlab-backup-cli.gemspec
-@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
- spec.add_dependency "activerecord", ">= 7"
- spec.add_dependency "activesupport", ">= 7"
- spec.add_dependency "bigdecimal", "~> 3.1"
-- spec.add_dependency "googleauth", "~> 1.8.1" # https://gitlab.com/gitlab-org/gitlab/-/issues/449019
-+ spec.add_dependency "googleauth", "~> 1.8" # https://gitlab.com/gitlab-org/gitlab/-/issues/449019
- 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|
spec.add_dependency "json", "~> 2.7"
spec.add_dependency "jwt", "~> 2.5"
diff --git a/www/gitlab/pkg-message b/www/gitlab/pkg-message
index d736f45ba52d..089734612436 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.3-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.2.x to 18.3.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.2-18.3-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-08-27 05:31:54 +0000