diff options
Diffstat (limited to 'www/gitlab')
| -rw-r--r-- | www/gitlab/Makefile | 52 | ||||
| -rw-r--r-- | www/gitlab/Makefile.common | 4 | ||||
| -rw-r--r-- | www/gitlab/distinfo | 12 | ||||
| -rw-r--r-- | www/gitlab/files/patch-Gemfile | 30 | ||||
| -rw-r--r-- | www/gitlab/files/patch-bin_background__jobs | 20 | ||||
| -rw-r--r-- | www/gitlab/files/patch-vendor_gems_sidekiq_sidekiq.gemspec | 11 | ||||
| -rw-r--r-- | www/gitlab/pkg-message | 6 |
7 files changed, 77 insertions, 58 deletions
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 191c53d788c9..9f1d2ba74b69 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -29,12 +29,12 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # mail/rubygem-net-pop is required as ruby 3.1 removed it #gitlab-zoekt-indexer>=0.16.0:textproc/gitlab-zoekt-indexer MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ - gitlab-elasticsearch-indexer>=5.9.1:textproc/gitlab-elasticsearch-indexer \ + gitlab-elasticsearch-indexer>=5.9.4: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.4.4:textproc/gitlab-zoekt-indexer \ + gitlab-zoekt-indexer>=1.6.2:textproc/gitlab-zoekt-indexer \ redis>=6.2.11:databases/redis \ yarn${NODEJS_SUFFIX}>=1.10.0:www/yarn${NODEJS_SUFFIX} \ gtar>0:archivers/gtar \ @@ -48,8 +48,8 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ 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.1<4:security/rubygem-openssl \ + rubygem-gitlab-secret_detection>=0.35.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 \ @@ -67,7 +67,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ 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.2<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-gl>=2.1.3<3:security/rubygem-omniauth-gl \ @@ -92,7 +92,7 @@ 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 \ @@ -106,7 +106,7 @@ 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 \ @@ -126,9 +126,9 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-google-apis-core-gitlab>=0.18.0<0.19:devel/rubygem-google-apis-core-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.90.0<0.91: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-cloudresourcemanager_v1-gitlab>=0.44.0<0.45:devel/rubygem-google-apis-cloudresourcemanager_v1-gitlab \ rubygem-google-apis-iam_v1-gitlab>=0.73.0<0.74:devel/rubygem-google-apis-iam_v1-gitlab \ rubygem-google-apis-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 \ @@ -149,7 +149,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ 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 \ @@ -159,15 +159,15 @@ 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.36<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.18,3<2.3,3:www/rubygem-rack22 \ rubygem-rack-timeout>=0.7.0<0.8:www/rubygem-rack-timeout \ rubygem-puma-gitlab>=6.6.1<6.6.2:www/rubygem-puma-gitlab \ rubygem-sd_notify>=0.1.1<0.2:devel/rubygem-sd_notify \ @@ -178,13 +178,13 @@ 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.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-gitlab>=5.4.0<5.4.1:databases/rubygem-redis-gitlab \ - rubygem-redis-client>=0.25.1<1:databases/rubygem-redis-client \ + rubygem-redis-client>=0.26.1<1:databases/rubygem-redis-client \ rubygem-redis-cluster-client>=0.13.5<1:databases/rubygem-redis-cluster-client \ rubygem-redis-clustering-gitlab>=5.4.0<5.4.1:databases/rubygem-redis-clustering-gitlab \ rubygem-connection_pool>=2.5.4<2.6:net/rubygem-connection_pool \ @@ -207,7 +207,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.5.1<0.6:databases/rubygem-click_house-client \ + rubygem-click_house-client>=0.8.0<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 \ @@ -219,7 +219,7 @@ 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.40.0<0.41:devel/rubygem-gitlab-labkit \ + rubygem-gitlab-labkit>=0.42.0<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 \ @@ -230,7 +230,7 @@ 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.28.0<2.29: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 \ @@ -276,18 +276,18 @@ 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.4.0:net/rubygem-gitaly \ + rubygem-gitaly>=18.4.1: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.75.0<1.76: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 \ @@ -311,7 +311,7 @@ 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.8<0.5:net/rubygem-devfile \ - rubygem-hashdiff>=1.2.0<1.3:devel/rubygem-hashdiff \ + 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.6<3:devel/rubygem-telesignenterprise \ @@ -324,7 +324,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.26<2:security/rubygem-gitlab-cloud-connector \ + rubygem-gitlab-cloud-connector>=1.33<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 \ diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index 6d44b00038e2..17873ac384d6 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,5 +1,5 @@ -GITLAB_VERSION= 18.4.3 -GITLAB_PORTREVISION= 2 +GITLAB_VERSION= 18.5.1 +GITLAB_PORTREVISION= 0 # Git version gitaly should use (from gitlab mirror) # Find current tag from Makefile and .gitlab-ci.yaml diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo index 89ed69ca076a..45bec2af3123 100644 --- a/www/gitlab/distinfo +++ b/www/gitlab/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1761396302 -SHA256 (gitlab-foss-v18.4.3.tar.bz2) = dd2c1c3261e8ad0547bb612733a5dfa01b186dab409e9b90a15da67617759e5b -SIZE (gitlab-foss-v18.4.3.tar.bz2) = 122558508 -TIMESTAMP = 1761396303 -SHA256 (gitlab-v18.4.3-ee.tar.bz2) = adc59024b9bd00128bf75b9a6fc3f4178ca41f64fa2043e2a53e4eda5602b72d -SIZE (gitlab-v18.4.3-ee.tar.bz2) = 138452921 +TIMESTAMP = 1761544051 +SHA256 (gitlab-foss-v18.5.1.tar.bz2) = 50f60927372f380930fc6a6b5b9bf3093c6b043ad488b8e5b941a8ca5bec5c91 +SIZE (gitlab-foss-v18.5.1.tar.bz2) = 122919401 +TIMESTAMP = 1761544091 +SHA256 (gitlab-v18.5.1-ee.tar.bz2) = e272ef2b363f2d5ba20b3a01eac3f17c07a193dbb453613d139a9400cb600e72 +SIZE (gitlab-v18.5.1-ee.tar.bz2) = 139335454 diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index c5e64b759360..d221500c3dda 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,6 +1,6 @@ ---- Gemfile.orig 2025-10-21 19:24:47 UTC +--- Gemfile.orig 2025-10-21 19:12:22 UTC +++ Gemfile -@@ -165,7 +165,7 @@ gem 'graphql', '2.5.11', feature_category: :api +@@ -166,7 +166,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 +@@ -296,7 +296,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature gem 'state_machines-activerecord', '~> 0.8.0', feature_category: :shared # Background jobs @@ -18,12 +18,12 @@ gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', -@@ -473,141 +473,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared +@@ -474,141 +474,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 'lefthook', '~> 1.13.0', require: false, feature_category: :tooling - gem 'rubocop', feature_category: :tooling, require: false - gem 'debug', '~> 1.11.0', feature_category: :shared - @@ -40,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 - @@ -62,7 +62,7 @@ - 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 @@ -160,7 +160,7 @@ gem 'octokit', '~> 9.0', feature_category: :importers # Needed by octokit: https://github.com/octokit/octokit.rb/pull/1688 gem 'faraday-multipart', '~> 1.0', feature_category: :importers -@@ -641,10 +515,10 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside +@@ -642,7 +516,7 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat # Gitaly GRPC protocol definitions @@ -168,12 +168,8 @@ +gem 'gitaly', '~> 18.4', feature_category: :gitaly # KAS GRPC protocol definitions --gem 'gitlab-kas-grpc', '~> 18.3.0', feature_category: :deployment_management -+gem 'gitlab-kas-grpc', '~> 18.3', feature_category: :deployment_management - - gem 'grpc', '~> 1.74.0', feature_category: :shared - -@@ -667,7 +541,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: : + gem 'gitlab-kas-grpc', '~> 18.5.0-rc4', feature_category: :deployment_management +@@ -668,7 +542,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: : gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :shared # Countries list @@ -182,7 +178,7 @@ gem 'retriable', '~> 3.1.2', feature_category: :shared -@@ -752,10 +626,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc +@@ -753,10 +627,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc gem 'duo_api', '~> 1.3', feature_category: :system_access 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-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 64b201d3412a..c11311173fd9 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.4-freebsd.md +https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/install/18.5-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.3.x to 18.4.x, please follow the instructions in the guide at: +switched from 18.4.x to 18.5.x, please follow the instructions in the guide at: -https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/18.3-18.4-freebsd.md +https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/18.4-18.5-freebsd.md If you just installed an minor upgrade of GitLab please follow the instructions in the guide at: |