diff options
Diffstat (limited to 'www/gitlab/files/patch-Gemfile')
| -rw-r--r-- | www/gitlab/files/patch-Gemfile | 109 |
1 files changed, 36 insertions, 73 deletions
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index 408e873e25c9..7943be7c3489 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,43 +1,14 @@ ---- Gemfile.orig 2025-05-07 09:41:59 UTC +--- Gemfile.orig 2025-08-20 06:43:08 UTC +++ Gemfile -@@ -168,8 +168,8 @@ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', fea - gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared +@@ -165,7 +165,7 @@ gem 'graphql', '2.5.11', feature_category: :api # GraphQL API --gem 'graphql', '2.4.13', feature_category: :api --gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api -+gem 'graphql', '~> 2.4.13', feature_category: :api -+#gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api + gem 'graphql', '2.5.11', feature_category: :api +-gem 'graphql-docs', '~> 5.2.0', group: [:development, :test], feature_category: :api ++#gem 'graphql-docs', '~> 5.2.0', group: [:development, :test], feature_category: :api gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api # Cells -@@ -220,7 +220,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 --gem 'google-apis-core', '~> 0.11.0', '>= 0.11.1', feature_category: :shared -+gem 'google-apis-core', '~> 0.11', '>= 0.11.1', feature_category: :shared - 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 - gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0', feature_category: :shared - gem 'google-apis-androidpublisher_v3', '~> 0.34.0', feature_category: :shared - --gem 'googleauth', '~> 1.8.1', feature_category: :shared -+gem 'googleauth', '~> 1.8', feature_category: :shared - 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 - gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base', feature_category: :shared - - group :puma do -- gem 'puma', '= 6.5.0', require: false, feature_category: :shared -+ gem 'puma', '~> 6.5', require: false, feature_category: :shared - gem 'sd_notify', '~> 0.1.0', require: false, feature_category: :shared - end - @@ -295,7 +295,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature gem 'state_machines-activerecord', '~> 0.8.0', feature_category: :shared @@ -47,23 +18,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 +@@ -468,148 +468,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 'lefthook', '~> 1.12.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 +54,9 @@ -end - -group :development, :test do -- gem 'deprecation_toolkit', '~> 1.5.1', require: false, feature_category: :shared -- gem 'bullet', '~> 7.2.0', feature_category: :shared -- gem 'parser', '= 3.3.7.1', feature_category: :shared +- 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 'pry-byebug', feature_category: :shared - gem 'pry-rails', '~> 0.3.9', feature_category: :shared - gem 'pry-shell', '~> 0.6.4', feature_category: :shared @@ -100,8 +64,8 @@ - gem 'awesome_print', require: false, feature_category: :shared - - gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database -- gem 'rspec-rails', '~> 7.0.0', feature_category: :shared -- gem 'factory_bot_rails', '~> 6.4.3', feature_category: :tooling +- gem 'rspec-rails', '~> 7.1.0', feature_category: :shared +- 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 @@ -120,7 +84,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', '~> 1.1.0', 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,14 +108,14 @@ -end - group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 4.8.0', require: false, feature_category: :tooling + gem 'gitlab-dangerfiles', '~> 4.10.0', require: false, feature_category: :tooling end -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 '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 @@ -178,6 +142,11 @@ - - gem 'graphlyte', '~> 1.0.0', feature_category: :shared - +- # Upload CI metrics to a GCP BigQuery instance +- # +- # We only use this gem in CI. +- gem 'google-cloud-bigquery', '~> 1.0', feature_category: :tooling +- - gem 'shoulda-matchers', '~> 6.4.0', require: false, feature_category: :shared - gem 'email_spec', '~> 2.3.0', feature_category: :shared - gem 'webmock', '~> 3.25.0', feature_category: :shared @@ -187,38 +156,32 @@ - 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.18.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 +@@ -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', '~> 17.8.0', feature_category: :gitaly -+gem 'gitaly', '~> 17.8', feature_category: :gitaly +-gem 'gitaly', '~> 18.2.0', feature_category: :gitaly ++gem 'gitaly', '~> 18.2', 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 - - # Lock the version before issues below are resolved: - # https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939 - # Or we can upgrade to a more recent version as long as we can confirm - # that it doesn't have the same issues. --gem 'grpc', '= 1.63.0', feature_category: :shared -+gem 'grpc', '~> 1.63', feature_category: :shared +-gem 'gitlab-kas-grpc', '~> 18.2.0', feature_category: :deployment_management ++gem 'gitlab-kas-grpc', '~> 18.2', feature_category: :deployment_management - gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared + gem 'grpc', '~> 1.74.0', 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 +@@ -669,7 +536,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: : + gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :shared # Countries list -gem 'countries', '~> 4.0.0', feature_category: :shared @@ -226,7 +189,7 @@ gem 'retriable', '~> 3.1.2', feature_category: :shared -@@ -754,10 +629,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc +@@ -750,10 +617,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc gem 'duo_api', '~> 1.3', feature_category: :system_access @@ -237,9 +200,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.26", require: 'gitlab/cloud_connector', feature_category: :plan_provisioning |