5 files changed, 60 insertions, 48 deletions
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