3 files changed, 40 insertions, 21 deletions
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