diff options
Diffstat (limited to 'www/gitlab/files')
| -rw-r--r-- | www/gitlab/files/patch-Gemfile | 34 | ||||
| -rw-r--r-- | www/gitlab/files/patch-config_gitlab.yml.example | 10 | ||||
| -rw-r--r-- | www/gitlab/files/patch-config_puma.rb.example | 8 |
3 files changed, 26 insertions, 26 deletions
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index d221500c3dda..cfe5cabc50e5 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,6 +1,6 @@ ---- Gemfile.orig 2025-10-21 19:12:22 UTC +--- Gemfile.orig 2025-11-19 16:58:17 UTC +++ Gemfile -@@ -166,7 +166,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 -@@ -296,7 +296,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,7 +18,7 @@ gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', -@@ -474,141 +474,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 @@ -57,7 +57,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.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 @@ -107,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 - @@ -154,22 +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.20.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 -@@ -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 --gem 'gitaly', '~> 18.4.0.pre.rc1', feature_category: :gitaly -+gem 'gitaly', '~> 18.4', 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.5.0-rc4', feature_category: :deployment_management -@@ -668,7 +542,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: : +-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.76.0', feature_category: :shared + +@@ -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 @@ -178,7 +178,7 @@ gem 'retriable', '~> 3.1.2', feature_category: :shared -@@ -753,10 +627,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 @@ -194,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-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example index d4e98d985eb3..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-10-21 19:24:47 UTC +--- config/gitlab.yml.example.orig 2025-11-19 16:58:17 UTC +++ config/gitlab.yml.example -@@ -507,7 +507,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 -@@ -1252,13 +1252,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 -@@ -1293,12 +1293,12 @@ production: &base +@@ -1294,12 +1294,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -41,7 +41,7 @@ # Git over HTTP upload_pack: true -@@ -1313,7 +1313,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). 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 |