Date: Mon, 19 Jan 2026 15:14:10 +0000 From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 1686f1a21034 - main - www/gitlab: major upgrade to 18.8.0 Message-ID: <696e4a42.242b6.54c02d80@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=1686f1a21034fc92fe969efcd98dc4576c28df12 commit 1686f1a21034fc92fe969efcd98dc4576c28df12 Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2026-01-19 14:54:33 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2026-01-19 14:55:30 +0000 www/gitlab: major upgrade to 18.8.0 Changes: https://about.gitlab.com/releases/2026/01/15/gitlab-18-8-released/ --- devel/gitaly/distinfo | 26 ++++++++++---------- net/gitlab-agent/distinfo | 10 ++++---- www/gitlab-pages/distinfo | 10 ++++---- www/gitlab-workhorse/distinfo | 10 ++++---- www/gitlab/Makefile | 30 ++++++++++++------------ www/gitlab/Makefile.common | 2 +- www/gitlab/distinfo | 12 +++++----- www/gitlab/files/patch-Gemfile | 8 +++---- www/gitlab/files/patch-bin_background__jobs | 8 +++---- www/gitlab/files/patch-config_gitlab.yml.example | 16 ++++++------- www/gitlab/files/patch-package.json | 4 ++-- www/gitlab/pkg-message | 4 ++-- 12 files changed, 69 insertions(+), 71 deletions(-) diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index 6a38ee0c05cc..35a3ce43b1f4 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,13 +1,13 @@ -TIMESTAMP = 1768122772 -SHA256 (go/devel_gitaly/gitaly-v18.7.1/go.mod) = bf373eee468af0e57c7816ba015809f29f09dcd7822f6f2573afac4a15664219 -SIZE (go/devel_gitaly/gitaly-v18.7.1/go.mod) = 14016 -SHA256 (go/devel_gitaly/gitaly-v18.7.1/gitaly-v18.7.1.tar.bz2) = c2124af590bd632fae6fb2c5a93b6aa2ac7c8b3dceca049fa10d9b68e200c8f2 -SIZE (go/devel_gitaly/gitaly-v18.7.1/gitaly-v18.7.1.tar.bz2) = 4665993 -SHA256 (go/devel_gitaly/gitaly-v18.7.1/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4 -SIZE (go/devel_gitaly/gitaly-v18.7.1/git-v2.50.0.tar.bz2) = 9249878 -SHA256 (go/devel_gitaly/gitaly-v18.7.1/gitlab-org-git-aea8cc3a10c325a22a75e2d4f582db959d3854ae_GL0.tar.gz) = d7cb6a43a72e1ebe2369964727a0dfc55ce07bde0214703ed6c156127bb51889 -SIZE (go/devel_gitaly/gitaly-v18.7.1/gitlab-org-git-aea8cc3a10c325a22a75e2d4f582db959d3854ae_GL0.tar.gz) = 11920888 -SHA256 (go/devel_gitaly/gitaly-v18.7.1/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = d3397b210ca156ed84ff69b3a7f6316c5026bd05d11455f23d8335473dceaf1b -SIZE (go/devel_gitaly/gitaly-v18.7.1/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = 11822923 -SHA256 (go/devel_gitaly/gitaly-v18.7.1/8309.patch) = 90377ee1d14ec92e69dd97ad6d7c1d2bcce1c05fdf6095f04d51780b22cd65c7 -SIZE (go/devel_gitaly/gitaly-v18.7.1/8309.patch) = 1285 +TIMESTAMP = 1768721788 +SHA256 (go/devel_gitaly/gitaly-v18.8.0/go.mod) = bf373eee468af0e57c7816ba015809f29f09dcd7822f6f2573afac4a15664219 +SIZE (go/devel_gitaly/gitaly-v18.8.0/go.mod) = 14016 +SHA256 (go/devel_gitaly/gitaly-v18.8.0/gitaly-v18.8.0.tar.bz2) = f5ad26739780331f4ee7fbe9423be8d62751792bed0a8fdf8f30e39f151301fb +SIZE (go/devel_gitaly/gitaly-v18.8.0/gitaly-v18.8.0.tar.bz2) = 4669387 +SHA256 (go/devel_gitaly/gitaly-v18.8.0/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4 +SIZE (go/devel_gitaly/gitaly-v18.8.0/git-v2.50.0.tar.bz2) = 9249878 +SHA256 (go/devel_gitaly/gitaly-v18.8.0/gitlab-org-git-aea8cc3a10c325a22a75e2d4f582db959d3854ae_GL0.tar.gz) = d7cb6a43a72e1ebe2369964727a0dfc55ce07bde0214703ed6c156127bb51889 +SIZE (go/devel_gitaly/gitaly-v18.8.0/gitlab-org-git-aea8cc3a10c325a22a75e2d4f582db959d3854ae_GL0.tar.gz) = 11920888 +SHA256 (go/devel_gitaly/gitaly-v18.8.0/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = d3397b210ca156ed84ff69b3a7f6316c5026bd05d11455f23d8335473dceaf1b +SIZE (go/devel_gitaly/gitaly-v18.8.0/gitlab-org-git-419c72cb8ada252b260efc38ff91fe201de7c8c3_GL0.tar.gz) = 11822923 +SHA256 (go/devel_gitaly/gitaly-v18.8.0/8309.patch) = 90377ee1d14ec92e69dd97ad6d7c1d2bcce1c05fdf6095f04d51780b22cd65c7 +SIZE (go/devel_gitaly/gitaly-v18.8.0/8309.patch) = 1285 diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo index 1df8066fec23..c1c728be1142 100644 --- a/net/gitlab-agent/distinfo +++ b/net/gitlab-agent/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1768122773 -SHA256 (go/net_gitlab-agent/gitlab-agent-v18.7.1/v18.7.1.mod) = 81d663919a3c5095761afddedbd0a268c988262096cbfaeafd1d4a31c3cb83c4 -SIZE (go/net_gitlab-agent/gitlab-agent-v18.7.1/v18.7.1.mod) = 9374 -SHA256 (go/net_gitlab-agent/gitlab-agent-v18.7.1/v18.7.1.zip) = d7f70ad4716cdf7e924e2b13d1f18a698df529d05a23ddf4035138b5c3141ce0 -SIZE (go/net_gitlab-agent/gitlab-agent-v18.7.1/v18.7.1.zip) = 1857016 +TIMESTAMP = 1768721790 +SHA256 (go/net_gitlab-agent/gitlab-agent-v18.8.0/v18.8.0.mod) = c73014e839dd525bdc8be99cf243eba6375af8846617eae3a40d2418816a410b +SIZE (go/net_gitlab-agent/gitlab-agent-v18.8.0/v18.8.0.mod) = 9374 +SHA256 (go/net_gitlab-agent/gitlab-agent-v18.8.0/v18.8.0.zip) = d94ddb4d83e1abc692a0d7c2c381b65d29f23adfe2cb5a8d425d236f34118e99 +SIZE (go/net_gitlab-agent/gitlab-agent-v18.8.0/v18.8.0.zip) = 1869229 diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo index e1a70f3b9ae7..17ccb4184108 100644 --- a/www/gitlab-pages/distinfo +++ b/www/gitlab-pages/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1768122775 -SHA256 (go/www_gitlab-pages/gitlab-pages-v18.7.1/go.mod) = 8bc5ad61abb3a5a6d07a64652460587511671a82c104cf5997806b5d609a8dd6 -SIZE (go/www_gitlab-pages/gitlab-pages-v18.7.1/go.mod) = 3523 -SHA256 (go/www_gitlab-pages/gitlab-pages-v18.7.1/gitlab-pages-v18.7.1.tar.bz2) = d2577a2772fb2adb1df8d084e862f13366d8ebf2df617ef22f1dfeff2058b10e -SIZE (go/www_gitlab-pages/gitlab-pages-v18.7.1/gitlab-pages-v18.7.1.tar.bz2) = 237496 +TIMESTAMP = 1768721791 +SHA256 (go/www_gitlab-pages/gitlab-pages-v18.8.0/go.mod) = 8bc5ad61abb3a5a6d07a64652460587511671a82c104cf5997806b5d609a8dd6 +SIZE (go/www_gitlab-pages/gitlab-pages-v18.8.0/go.mod) = 3523 +SHA256 (go/www_gitlab-pages/gitlab-pages-v18.8.0/gitlab-pages-v18.8.0.tar.bz2) = ce80ee43fb904671b4411c69e0f721255e87360f443c45164cd713952f6e84dc +SIZE (go/www_gitlab-pages/gitlab-pages-v18.8.0/gitlab-pages-v18.8.0.tar.bz2) = 237730 diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index debebce077c7..a7db34189357 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1768122791 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.7.1/go.mod) = dd3a4f3dae583fc4c00686c61fa6033d1c9b99e428f29c79a022ee39a4692ada -SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.7.1/go.mod) = 9356 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.7.1/gitlab-foss-v18.7.1.tar.bz2) = 502774818fb7ce914a37f56c93cccc55b5d9ec77bed7c336d9da6fc850692882 -SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.7.1/gitlab-foss-v18.7.1.tar.bz2) = 129789285 +TIMESTAMP = 1768721811 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.8.0/go.mod) = dd3a4f3dae583fc4c00686c61fa6033d1c9b99e428f29c79a022ee39a4692ada +SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.8.0/go.mod) = 9356 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.8.0/gitlab-foss-v18.8.0.tar.bz2) = ccaae735fdfad6059d6fa39efd0388ff27473b35213661089ebd11094d70bc0c +SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.8.0/gitlab-foss-v18.8.0.tar.bz2) = 130228542 diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 46663a013874..28cc3cede5d1 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -31,12 +31,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # Gitlab does not work with nodejs 24, but keep it here for a later upgrade # yarn${NODEJS_SUFFIX}>=1.10.0:www/yarn${NODEJS_SUFFIX} MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ - gitlab-elasticsearch-indexer>=5.12.0:textproc/gitlab-elasticsearch-indexer \ + gitlab-elasticsearch-indexer>=5.12.2:textproc/gitlab-elasticsearch-indexer \ gitlab-agent>=${GITLAB_VERSION}:net/gitlab-agent \ gitlab-pages>=${GITLAB_VERSION}:www/gitlab-pages \ gitlab-shell>=14.45.5:devel/gitlab-shell \ gitlab-workhorse>=${GITLAB_VERSION}:www/gitlab-workhorse \ - gitlab-zoekt-indexer>=1.7.6:textproc/gitlab-zoekt-indexer \ + gitlab-zoekt-indexer>=1.8.0:textproc/gitlab-zoekt-indexer \ redis>=6.2.11:databases/redis \ yarn-node20>=1.10.0:www/yarn-node20 \ gtar>0:archivers/gtar \ @@ -49,9 +49,9 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-zeitwerk>=2.6.18<2.6.19:devel/rubygem-zeitwerk \ rubygem-drb-gitlab>=2.2.3<3:devel/rubygem-drb-gitlab \ rubygem-bootsnap-gitlab>=1.18.6<1.19:devel/rubygem-bootsnap-gitlab \ - rubygem-ffi>=1.17.2<2:devel/rubygem-ffi \ + rubygem-ffi>=1.17.3<2:devel/rubygem-ffi \ rubygem-openssl3>=3.3.2<3.4:security/rubygem-openssl3 \ - rubygem-gitlab-secret_detection>=0.38.0<1:security/rubygem-gitlab-secret_detection \ + rubygem-gitlab-secret_detection>=0.39.1<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 \ @@ -95,9 +95,9 @@ 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.26<3:security/rubygem-acme-client-gitlab \ + rubygem-acme-client-gitlab>=2.0.30<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-ohai>=19.1.6<19.2:sysutils/rubygem-ohai \ rubygem-gpgme>=2.0.25<2.1.0:security/rubygem-gpgme \ rubygem-gitlab_omniauth-ldap-gitlab>=2.3.0<2.4.0:net/rubygem-gitlab_omniauth-ldap-gitlab \ rubygem-net-ldap>=0.20.0<0.21:net/rubygem-net-ldap \ @@ -157,11 +157,11 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-org-ruby>=0.9.12<0.10.0:textproc/rubygem-org-ruby \ rubygem-creole>=0.5.0<0.6.0:textproc/rubygem-creole \ rubygem-wikicloth081>=0.8.1<0.8.2:textproc/rubygem-wikicloth081 \ - rubygem-asciidoctor>=2.0.18<2.1.0:textproc/rubygem-asciidoctor \ + rubygem-asciidoctor>=2.0.26<2.1.0:textproc/rubygem-asciidoctor \ 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.1<4.7:textproc/rubygem-rouge-gitlab \ + rubygem-rouge-gitlab>=4.7.0<4.8: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.39<0.1:textproc/rubygem-gitlab-glfm-markdown \ @@ -175,7 +175,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-sd_notify>=0.1.1<0.2:devel/rubygem-sd_notify \ rubygem-state_machines-activerecord-gitlab>=0.100.0<0.101.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-sidekiq-cron-rails-gitlab>=2.3.1<2.4:devel/rubygem-sidekiq-cron-rails-gitlab \ 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 \ @@ -209,7 +209,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.8.4<0.9:databases/rubygem-click_house-client \ + rubygem-click_house-client>=0.8.6<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 \ @@ -283,13 +283,13 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-gitaly>=18.7.0:net/rubygem-gitaly \ rubygem-gitlab-kas-grpc>=${GITLAB_KAS_GRPC_VERSION}:net/rubygem-gitlab-kas-grpc \ rubygem-grpc-gitlab>=1.76.0<1.77:net/rubygem-grpc-gitlab \ - rubygem-google-protobuf3>=3.25.8<5:devel/rubygem-google-protobuf3 \ - rubygem-toml-rb>=2.2.0<3:www/rubygem-toml-rb \ + rubygem-google-protobuf>=3.25.8<5:devel/rubygem-google-protobuf \ + rubygem-toml-rb>=4.1<5: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>=1.1.0<1.2:devel/rubygem-gitlab-experiment \ + rubygem-gitlab-experiment>=1.2.0<1.3: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 \ @@ -302,7 +302,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-jsonb_accessor>=1.4<2:www/rubygem-jsonb_accessor \ rubygem-json-gitlab>=2.13.1<2.14:devel/rubygem-json-gitlab \ rubygem-json_schemer>=2.3.0<2.4:devel/rubygem-json_schemer \ - rubygem-oj>=3.16.11<3.17:devel/rubygem-oj \ + rubygem-oj>=3.16.13<3.17:devel/rubygem-oj \ rubygem-oj-introspect>=0.8<1:devel/rubygem-oj-introspect \ 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 \ @@ -326,7 +326,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.35<2:security/rubygem-gitlab-cloud-connector \ + rubygem-gitlab-cloud-connector>=1.40<2:security/rubygem-gitlab-cloud-connector \ rubygem-gvltools>=0.4.0<0.5:devel/rubygem-gvltools \ rubygem-gitlab_query_language>=0.20.11<0.21:devel/rubygem-gitlab_query_language \ rubygem-google-cloud-profiler-v2>=0.3<1:textproc/rubygem-google-cloud-profiler-v2 \ diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index fff781575765..209f566a59a1 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,4 +1,4 @@ -GITLAB_VERSION= 18.7.1 +GITLAB_VERSION= 18.8.0 GITLAB_PORTREVISION= 4 # decrease this only if GITLAB_KAS_GRPC_VERSION is upgraded # Git version gitaly should use (from gitlab mirror) diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo index aa5d73040691..81c37f217183 100644 --- a/www/gitlab/distinfo +++ b/www/gitlab/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1768122719 -SHA256 (gitlab-foss-v18.7.1.tar.bz2) = 502774818fb7ce914a37f56c93cccc55b5d9ec77bed7c336d9da6fc850692882 -SIZE (gitlab-foss-v18.7.1.tar.bz2) = 129789285 -TIMESTAMP = 1768122762 -SHA256 (gitlab-v18.7.1-ee.tar.bz2) = fb883c3f6c7fcd6eaff1102bf2087fc0bbe9dba0dc402c77151fcd6bdaedbfad -SIZE (gitlab-v18.7.1-ee.tar.bz2) = 146719684 +TIMESTAMP = 1768721734 +SHA256 (gitlab-foss-v18.8.0.tar.bz2) = ccaae735fdfad6059d6fa39efd0388ff27473b35213661089ebd11094d70bc0c +SIZE (gitlab-foss-v18.8.0.tar.bz2) = 130228542 +TIMESTAMP = 1768721780 +SHA256 (gitlab-v18.8.0-ee.tar.bz2) = c6a603195709c423c1f8de25d612aece26eee5654356187ada518b96539ff252 +SIZE (gitlab-v18.8.0-ee.tar.bz2) = 147336482 diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index 1cc83e718f0c..b42427ebe22e 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2025-12-17 03:15:28 UTC +--- Gemfile.orig 2026-01-14 08:40:57 UTC +++ Gemfile @@ -163,7 +163,7 @@ gem 'graphql', '2.5.11', feature_category: :api @@ -15,7 +15,7 @@ # Background jobs -gem 'sidekiq', path: 'vendor/gems/sidekiq', require: 'sidekiq', feature_category: :scalability +gem 'sidekiq', '>= 7.3.9', require: 'sidekiq', feature_category: :scalability - gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability + gem 'sidekiq-cron', '~> 2.3.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', @@ -469,138 +469,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared # @@ -151,7 +151,7 @@ - # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 - gem 'derailed_benchmarks', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - -- gem 'gitlab_quality-test_tooling', '~> 3.1.0', require: false, feature_category: :tooling +- gem 'gitlab_quality-test_tooling', '~> 3.3.0', require: false, feature_category: :tooling -end - gem 'octokit', '~> 9.0', feature_category: :importers @@ -191,5 +191,5 @@ -gem "i18n_data", "~> 0.13.1", feature_category: :system_access +gem "i18n_data", "~> 0.13", feature_category: :system_access - gem "gitlab-cloud-connector", "~> 1.35", require: 'gitlab/cloud_connector', feature_category: :plan_provisioning + gem "gitlab-cloud-connector", "~> 1.40", 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 532332130faa..99925bc25180 100644 --- a/www/gitlab/files/patch-bin_background__jobs +++ b/www/gitlab/files/patch-bin_background__jobs @@ -1,10 +1,8 @@ ---- bin/background_jobs.orig 2025-10-21 19:12:22 UTC +--- bin/background_jobs.orig 2026-01-14 08:40:57 UTC +++ bin/background_jobs -@@ -49,19 +49,14 @@ start_sidekiq() - start_sidekiq() - { +@@ -51,17 +51,13 @@ start_sidekiq() cmd="exec" -- chpst=$(command -v chpst) + chpst=$(command -v chpst || true) - if [ -n "$chpst" ]; then - cmd="${cmd} ${chpst} -P" diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example index bd0e3350d243..b4798fa8a670 100644 --- a/www/gitlab/files/patch-config_gitlab.yml.example +++ b/www/gitlab/files/patch-config_gitlab.yml.example @@ -1,4 +1,4 @@ ---- config/gitlab.yml.example.orig 2025-12-17 03:15:28 UTC +--- config/gitlab.yml.example.orig 2026-01-14 08:40:57 UTC +++ config/gitlab.yml.example @@ -516,7 +516,7 @@ production: &base ## GitLab Pages @@ -9,7 +9,7 @@ # The location where pages are stored (default: shared/pages). # path: shared/pages -@@ -1261,13 +1261,13 @@ production: &base +@@ -1288,13 +1288,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 +@@ -1329,12 +1329,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -41,7 +41,7 @@ # Git over HTTP upload_pack: true -@@ -1322,7 +1322,7 @@ production: &base +@@ -1349,7 +1349,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 @@ database_traffic_capture: config: -@@ -1348,7 +1348,7 @@ production: &base +@@ -1375,7 +1375,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 -@@ -1370,13 +1370,13 @@ production: &base +@@ -1397,13 +1397,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 -@@ -1397,18 +1397,18 @@ production: &base +@@ -1424,18 +1424,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: -@@ -1635,13 +1635,13 @@ test: +@@ -1662,13 +1662,13 @@ test: gitaly_address: unix:tmp/tests/gitaly/praefect.socket gitaly: diff --git a/www/gitlab/files/patch-package.json b/www/gitlab/files/patch-package.json index 24e4e7096a1a..19a4e012185d 100644 --- a/www/gitlab/files/patch-package.json +++ b/www/gitlab/files/patch-package.json @@ -1,6 +1,6 @@ ---- package.json.orig 2025-12-31 05:50:46 UTC +--- package.json.orig 2026-01-14 08:40:57 UTC +++ package.json -@@ -326,7 +326,8 @@ +@@ -327,7 +327,8 @@ "@types/node": "14.17.5", "chokidar": "^3.5.3", "nwsapi": "2.2.2", diff --git a/www/gitlab/pkg-message b/www/gitlab/pkg-message index 4d7a1f19a1d5..d4973b5928a2 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.7-freebsd.md +https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/install/18.8-freebsd.md EOM type: install } @@ -20,7 +20,7 @@ EOM If you just installed an major upgrade of GitLab, for example you switched from 18.6.x to 18.7.x, please follow the instructions in the guide at: -https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/18.6-18.7-freebsd.md +https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/18.7-18.8-freebsd.md If you just installed an minor upgrade of GitLab please follow the instructions in the guide at:home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?696e4a42.242b6.54c02d80>