diff options
Diffstat (limited to 'www/gitlab/files')
4 files changed, 41 insertions, 47 deletions
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index 408e873e25c9..fff952d72391 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,6 +1,6 @@ ---- Gemfile.orig 2025-05-07 09:41:59 UTC +--- Gemfile.orig 2025-05-14 17:45:50 UTC +++ Gemfile -@@ -168,8 +168,8 @@ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', fea +@@ -160,8 +160,8 @@ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', fea gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared # GraphQL API @@ -11,7 +11,7 @@ gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api # Cells -@@ -220,7 +220,7 @@ gem 'google-cloud-storage', '~> 1.45.0', feature_categ +@@ -216,7 +216,7 @@ gem 'google-cloud-storage', '~> 1.45.0', feature_categ gem 'google-apis-storage_v1', '~> 0.29', feature_category: :shared gem 'google-cloud-storage', '~> 1.45.0', feature_category: :shared # We need >= 0.11.1 because that's when match_glob support is added to list_objects @@ -20,7 +20,7 @@ gem 'google-apis-compute_v1', '~> 0.57.0', feature_category: :shared gem 'google-apis-container_v1', '~> 0.43.0', feature_category: :shared gem 'google-apis-container_v1beta1', '~> 0.43.0', feature_category: :shared -@@ -231,7 +231,7 @@ gem 'google-apis-androidpublisher_v3', '~> 0.34.0', fe +@@ -227,7 +227,7 @@ gem 'google-apis-androidpublisher_v3', '~> 0.34.0', fe gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0', feature_category: :shared gem 'google-apis-androidpublisher_v3', '~> 0.34.0', feature_category: :shared @@ -29,7 +29,7 @@ gem 'google-cloud-artifact_registry-v1', '~> 0.11.0', feature_category: :shared gem 'google-cloud-compute-v1', '~> 2.6.0', feature_category: :shared -@@ -287,7 +287,7 @@ group :puma do +@@ -283,7 +283,7 @@ group :puma do gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base', feature_category: :shared group :puma do @@ -38,7 +38,7 @@ gem 'sd_notify', '~> 0.1.0', require: false, feature_category: :shared end -@@ -295,7 +295,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature +@@ -291,7 +291,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature gem 'state_machines-activerecord', '~> 0.8.0', feature_category: :shared # Background jobs @@ -47,23 +47,16 @@ gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', -@@ -433,7 +433,7 @@ gem 'snowplow-tracker', '~> 0.8.0', feature_category: - gem 'snowplow-tracker', '~> 0.8.0', feature_category: :product_analytics - - # Metrics --gem 'webrick', '~> 1.8.1', require: false, feature_category: :shared -+gem 'webrick', '~> 1.8', require: false, feature_category: :shared - gem 'prometheus-client-mmap', '~> 1.2.8', require: 'prometheus/client', feature_category: :shared - - # Event-driven reactor for Ruby -@@ -475,140 +475,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared +@@ -471,143 +471,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared gem 'warning', '~> 1.5.0', feature_category: :shared -group :development do - gem 'lefthook', '~> 1.11.0', require: false, feature_category: :tooling - gem 'rubocop', feature_category: :tooling -- gem 'solargraph', '~> 0.47.2', require: false, feature_category: :shared +- +- gem 'solargraph', '~> 0.54.0', require: false, feature_category: :shared +- gem 'solargraph-rspec', '~> 0.5.1', require: false, feature_category: :shared - - gem 'letter_opener_web', '~> 3.0.0', feature_category: :shared - gem 'lookbook', '~> 2.3', feature_category: :shared @@ -90,9 +83,9 @@ -end - -group :development, :test do -- gem 'deprecation_toolkit', '~> 1.5.1', require: false, feature_category: :shared +- gem 'deprecation_toolkit', '~> 2.2.3', require: false, feature_category: :shared - gem 'bullet', '~> 7.2.0', feature_category: :shared -- gem 'parser', '= 3.3.7.1', feature_category: :shared +- gem 'parser', '= 3.3.8.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 @@ -120,7 +113,7 @@ - gem 'influxdb-client', '~> 3.1', require: false, feature_category: :tooling - - gem 'knapsack', '~> 4.0.0', feature_category: :tooling -- gem 'crystalball', '~> 0.7.0', require: false, feature_category: :tooling +- gem 'gitlab-crystalball', '~> 0.7.2', require: false, feature_category: :tooling - gem 'test_file_finder', '~> 0.3.1', feature_category: :tooling - - gem 'simple_po_parser', '~> 1.1.6', require: false, feature_category: :shared @@ -144,7 +137,7 @@ -end - group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 4.8.0', require: false, feature_category: :tooling + gem 'gitlab-dangerfiles', '~> 4.9.0', require: false, feature_category: :tooling end -group :development, :test, :coverage do @@ -187,17 +180,18 @@ - gem 'rspec_junit_formatter', feature_category: :shared - gem 'guard-rspec', feature_category: :shared - gem 'axe-core-rspec', '~> 4.10.0', feature_category: :tooling +- gem 'state_machines-rspec', '~> 0.6', feature_category: :shared - - # 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.8.0', require: false, feature_category: :tooling +- gem 'gitlab_quality-test_tooling', '~> 2.10.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,16 +518,16 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside +@@ -642,16 +514,16 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat # Gitaly GRPC protocol definitions @@ -205,8 +199,8 @@ +gem 'gitaly', '~> 17.8', feature_category: :gitaly # KAS GRPC protocol definitions --gem 'gitlab-kas-grpc', '~> 17.9.0.pre.rc2', feature_category: :deployment_management -+gem 'gitlab-kas-grpc', '~> 17.9', feature_category: :deployment_management +-gem 'gitlab-kas-grpc', '~> 17.11.0', feature_category: :deployment_management ++gem 'gitlab-kas-grpc', '~> 18.0', feature_category: :deployment_management # Lock the version before issues below are resolved: # https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939 @@ -217,8 +211,8 @@ gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared -@@ -673,7 +548,7 @@ gem 'gitlab-net-dns', '~> 0.10.0', feature_category: : - gem 'gitlab-net-dns', '~> 0.10.0', feature_category: :shared +@@ -672,7 +544,7 @@ gem 'gitlab-net-dns', '~> 0.12.0', feature_category: : + gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :shared # Countries list -gem 'countries', '~> 4.0.0', feature_category: :shared @@ -226,7 +220,7 @@ gem 'retriable', '~> 3.1.2', feature_category: :shared -@@ -754,10 +629,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc +@@ -753,10 +625,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc gem 'duo_api', '~> 1.3', feature_category: :system_access @@ -237,9 +231,9 @@ + gem 'gitlab-sdk', '~> 0.3.0', feature_category: :application_instrumentation - gem 'paper_trail', '~> 15.0', feature_category: :shared + gem 'paper_trail', '~> 16.0', feature_category: :shared -gem "i18n_data", "~> 0.13.1", feature_category: :system_access +gem "i18n_data", "~> 0.13", feature_category: :system_access - gem "gitlab-cloud-connector", "~> 1.5", require: 'gitlab/cloud_connector', feature_category: :cloud_connector + gem "gitlab-cloud-connector", "~> 1.11", require: 'gitlab/cloud_connector', feature_category: :cloud_connector diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example index 09cb658db5d2..3ace91d53c65 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-04-16 04:05:48 UTC +--- config/gitlab.yml.example.orig 2025-05-14 17:45:50 UTC +++ config/gitlab.yml.example -@@ -484,7 +484,7 @@ production: &base +@@ -489,7 +489,7 @@ production: &base ## GitLab Pages pages: enabled: false @@ -9,7 +9,7 @@ # The location where pages are stored (default: shared/pages). # path: shared/pages -@@ -494,9 +494,9 @@ production: &base +@@ -499,9 +499,9 @@ production: &base host: example.com port: 80 # Set to 443 if you serve the pages with HTTPS https: false # Set to true if you serve the pages with HTTPS @@ -22,7 +22,7 @@ # File that contains the shared secret key for verifying access for gitlab-pages. # Default is '.gitlab_pages_secret' relative to Rails.root (i.e. root of the GitLab app). -@@ -1227,13 +1227,13 @@ production: &base +@@ -1233,13 +1233,13 @@ production: &base repositories: storages: # You must have at least a `default` storage path. default: @@ -38,7 +38,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 -@@ -1268,12 +1268,12 @@ production: &base +@@ -1274,12 +1274,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -54,7 +54,7 @@ # Git over HTTP upload_pack: true -@@ -1288,7 +1288,7 @@ production: &base +@@ -1294,7 +1294,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). @@ -63,7 +63,7 @@ cell: # enabled: false -@@ -1306,7 +1306,7 @@ production: &base +@@ -1312,7 +1312,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). @@ -72,7 +72,7 @@ # The URL to the external KAS API (used by the Kubernetes agents) # external_url: wss://kas.example.com -@@ -1333,13 +1333,13 @@ production: &base +@@ -1339,13 +1339,13 @@ production: &base ## GitLab Elasticsearch settings elasticsearch: @@ -88,7 +88,7 @@ ## Webpack settings # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running -@@ -1360,18 +1360,18 @@ production: &base +@@ -1366,18 +1366,18 @@ production: &base # Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq. sidekiq_exporter: @@ -114,7 +114,7 @@ # Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma. web_exporter: -@@ -1598,13 +1598,13 @@ test: +@@ -1604,13 +1604,13 @@ test: gitaly_address: unix:tmp/tests/gitaly/praefect.socket gitaly: diff --git a/www/gitlab/files/patch-config_initializers_1__settings.rb b/www/gitlab/files/patch-config_initializers_1__settings.rb index 2c8adc9a51e9..6a3c4491eb22 100644 --- a/www/gitlab/files/patch-config_initializers_1__settings.rb +++ b/www/gitlab/files/patch-config_initializers_1__settings.rb @@ -1,6 +1,6 @@ ---- config/initializers/1_settings.rb.orig 2025-03-19 10:41:02 UTC +--- config/initializers/1_settings.rb.orig 2025-05-14 17:45:50 UTC +++ config/initializers/1_settings.rb -@@ -215,11 +215,7 @@ Settings.gitlab['ssh_user'] ||= Settings.gitlab.user +@@ -216,11 +216,7 @@ Settings.gitlab['ssh_user'] ||= Settings.gitlab.user Settings.gitlab['user'] ||= 'git' # External configuration may cause the ssh user to differ from the GitLab user Settings.gitlab['ssh_user'] ||= Settings.gitlab.user 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 7346dbb850eb..9844d39df8d4 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,15 +1,15 @@ ---- gems/gitlab-backup-cli/gitlab-backup-cli.gemspec.orig 2025-03-19 10:41:02 UTC +--- gems/gitlab-backup-cli/gitlab-backup-cli.gemspec.orig 2025-05-14 17:45:50 UTC +++ gems/gitlab-backup-cli/gitlab-backup-cli.gemspec -@@ -26,7 +26,7 @@ Gem::Specification.new do |spec| - +@@ -27,7 +27,7 @@ Gem::Specification.new do |spec| spec.add_dependency "activerecord", ">= 7" spec.add_dependency "activesupport", ">= 7" + spec.add_dependency "bigdecimal", "~> 3.1" - spec.add_dependency "googleauth", "~> 1.8.1" # https://gitlab.com/gitlab-org/gitlab/-/issues/449019 + spec.add_dependency "googleauth", "~> 1.8" # https://gitlab.com/gitlab-org/gitlab/-/issues/449019 spec.add_dependency "google-cloud-storage_transfer", "~> 1.2.0" + spec.add_dependency "mutex_m", "~> 0.3" spec.add_dependency "pg", "~> 1.5.6" - spec.add_dependency "rainbow", "~> 3.0" -@@ -38,11 +38,11 @@ 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" |