diff options
Diffstat (limited to 'www/gitlab/files')
| -rw-r--r-- | www/gitlab/files/patch-Gemfile | 27 | ||||
| -rw-r--r-- | www/gitlab/files/patch-config_gitlab.yml.example | 18 | ||||
| -rw-r--r-- | www/gitlab/files/patch-config_initializers_sprockets__patch.rb | 11 | ||||
| -rw-r--r-- | www/gitlab/files/patch-gems_bundler-checksum_bundler-checksum.gemspec (renamed from www/gitlab/files/patch-vendor_gems_bundler-checksum_bundler-checksum.gemspec) | 4 | ||||
| -rw-r--r-- | www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec | 9 |
5 files changed, 34 insertions, 35 deletions
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index 704da6697d22..12b4438204ba 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2025-06-18 04:18:20 UTC +--- Gemfile.orig 2025-07-16 11:39:10 UTC +++ Gemfile @@ -164,8 +164,8 @@ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', fea gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared @@ -38,7 +38,7 @@ gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', -@@ -472,143 +472,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared +@@ -465,143 +465,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared gem 'warning', '~> 1.5.0', feature_category: :shared @@ -85,7 +85,7 @@ - - gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database - gem 'rspec-rails', '~> 7.1.0', feature_category: :shared -- gem 'factory_bot_rails', '~> 6.4.3', feature_category: :tooling +- gem 'factory_bot_rails', '~> 6.5.0', feature_category: :tooling - - # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) - gem 'minitest', '~> 5.11.0', feature_category: :shared @@ -135,7 +135,7 @@ - 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 'undercover', '~> 0.6.0', require: false, feature_category: :tooling +- gem 'undercover', '~> 0.7.0', require: false, feature_category: :tooling -end - # Gems required in omnibus-gitlab pipeline @@ -182,16 +182,21 @@ 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 -@@ -646,7 +518,7 @@ gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: : +@@ -639,11 +511,11 @@ gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: : gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :gitaly # KAS GRPC protocol definitions --gem 'gitlab-kas-grpc', '~> 17.11.0', feature_category: :deployment_management -+gem 'gitlab-kas-grpc', '~> 18.1.0', feature_category: :deployment_management +-gem 'gitlab-kas-grpc', '~> 18.1.0', feature_category: :deployment_management ++gem 'gitlab-kas-grpc', '~> 18.2.0', feature_category: :deployment_management - gem 'grpc', '~> 1.72.0', feature_category: :shared + # Lock until 1.74.0 is available + # https://gitlab.com/gitlab-com/gl-infra/production/-/issues/20067 +-gem 'grpc', '= 1.63.0', feature_category: :shared ++gem 'grpc', '~> 1.63', feature_category: :shared -@@ -669,7 +541,7 @@ gem 'gitlab-net-dns', '~> 0.12.0', feature_category: : + gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared + +@@ -664,7 +536,7 @@ gem 'gitlab-net-dns', '~> 0.12.0', feature_category: : gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :shared # Countries list @@ -200,7 +205,7 @@ gem 'retriable', '~> 3.1.2', feature_category: :shared -@@ -750,10 +622,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc +@@ -746,10 +618,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc gem 'duo_api', '~> 1.3', feature_category: :system_access @@ -216,4 +221,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.14", require: 'gitlab/cloud_connector', feature_category: :cloud_connector + gem "gitlab-cloud-connector", "~> 1.21", 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 334de9d0c6fb..d06f8232e96f 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-06-18 04:18:20 UTC +--- config/gitlab.yml.example.orig 2025-07-16 11:39:10 UTC +++ config/gitlab.yml.example -@@ -493,7 +493,7 @@ production: &base +@@ -498,7 +498,7 @@ production: &base ## GitLab Pages pages: enabled: false @@ -9,7 +9,7 @@ # The location where pages are stored (default: shared/pages). # path: shared/pages -@@ -1238,13 +1238,13 @@ production: &base +@@ -1243,13 +1243,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 -@@ -1279,12 +1279,12 @@ production: &base +@@ -1284,12 +1284,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -41,7 +41,7 @@ # Git over HTTP upload_pack: true -@@ -1299,7 +1299,7 @@ production: &base +@@ -1304,7 +1304,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 @@ cell: # enabled: false -@@ -1317,7 +1317,7 @@ production: &base +@@ -1322,7 +1322,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 -@@ -1344,13 +1344,13 @@ production: &base +@@ -1349,13 +1349,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 -@@ -1371,18 +1371,18 @@ production: &base +@@ -1376,18 +1376,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: -@@ -1609,13 +1609,13 @@ test: +@@ -1614,13 +1614,13 @@ test: gitaly_address: unix:tmp/tests/gitaly/praefect.socket gitaly: diff --git a/www/gitlab/files/patch-config_initializers_sprockets__patch.rb b/www/gitlab/files/patch-config_initializers_sprockets__patch.rb deleted file mode 100644 index 8b031049c646..000000000000 --- a/www/gitlab/files/patch-config_initializers_sprockets__patch.rb +++ /dev/null @@ -1,11 +0,0 @@ ---- config/initializers/sprockets_patch.rb.orig 2024-09-24 23:32:11 UTC -+++ config/initializers/sprockets_patch.rb -@@ -8,7 +8,7 @@ require 'sprockets/utils' - - require 'sprockets/utils' - --unless Gem::Version.new(Sprockets::VERSION) == Gem::Version.new('3.7.2') -+unless Gem::Version.new(Sprockets::VERSION) == Gem::Version.new('3.7.5') - raise 'New version of Sprockets detected. This patch can likely be removed.' - end - diff --git a/www/gitlab/files/patch-vendor_gems_bundler-checksum_bundler-checksum.gemspec b/www/gitlab/files/patch-gems_bundler-checksum_bundler-checksum.gemspec index 915cd5764c09..4d5a8375456e 100644 --- a/www/gitlab/files/patch-vendor_gems_bundler-checksum_bundler-checksum.gemspec +++ b/www/gitlab/files/patch-gems_bundler-checksum_bundler-checksum.gemspec @@ -1,5 +1,5 @@ ---- vendor/gems/bundler-checksum/bundler-checksum.gemspec.orig 2024-07-09 07:11:30 UTC -+++ vendor/gems/bundler-checksum/bundler-checksum.gemspec +--- gems/bundler-checksum/bundler-checksum.gemspec.orig 2025-07-16 16:34:28 UTC ++++ gems/bundler-checksum/bundler-checksum.gemspec @@ -14,8 +14,7 @@ Gem::Specification.new do |spec| spec.license = 'MIT' diff --git a/www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec b/www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec index cf08a9593f99..8912856cee2b 100644 --- a/www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec +++ b/www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec @@ -1,4 +1,4 @@ ---- gems/gitlab-backup-cli/gitlab-backup-cli.gemspec.orig 2025-06-18 04:18:20 UTC +--- gems/gitlab-backup-cli/gitlab-backup-cli.gemspec.orig 2025-07-09 01:48:55 UTC +++ gems/gitlab-backup-cli/gitlab-backup-cli.gemspec @@ -27,7 +27,7 @@ Gem::Specification.new do |spec| spec.add_dependency "activerecord", ">= 7" @@ -9,7 +9,12 @@ spec.add_dependency "google-cloud-storage_transfer", "~> 1.2.0" spec.add_dependency "mutex_m", "~> 0.3" spec.add_dependency "pg", "~> 1.5.6" -@@ -44,7 +44,7 @@ Gem::Specification.new do |spec| +@@ -40,11 +40,11 @@ Gem::Specification.new do |spec| + spec.add_dependency "concurrent-ruby", "~> 1.1" + spec.add_dependency "faraday", "~> 2" + spec.add_dependency "google-protobuf", "~> 3.25", ">= 3.25.3" +- spec.add_dependency "grpc", "= 1.63.0" ++ spec.add_dependency "grpc", "~> 1.63" spec.add_dependency "json", "~> 2.7" spec.add_dependency "jwt", "~> 2.5" spec.add_dependency "logger", "~> 1.5" |