ports/www/gitlab/files/patch-Gemfile

--- Gemfile.orig	2024-09-18 10:07:13 UTC
+++ Gemfile
@@ -156,7 +156,7 @@ gem 'graphql', '~> 2.3.14', feature_category: :api
 
 # GraphQL API
 gem 'graphql', '~> 2.3.14', feature_category: :api
-gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api
+#gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api
 gem 'graphiql-rails', '~> 1.10', feature_category: :api
 gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api
 gem 'graphlient', '~> 0.8.0', feature_category: :importers # Used by BulkImport feature (group::import)
@@ -209,7 +209,7 @@ gem 'google-cloud-storage', '~> 1.45.0' # rubocop:todo
 gem 'google-apis-storage_v1', '~> 0.29' # rubocop:todo Gemfile/MissingFeatureCategory
 gem 'google-cloud-storage', '~> 1.45.0' # rubocop:todo Gemfile/MissingFeatureCategory
 # 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' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'google-apis-core', '~> 0.11', '>= 0.11.1' # rubocop:todo Gemfile/MissingFeatureCategory
 gem 'google-apis-compute_v1', '~> 0.57.0' # rubocop:todo Gemfile/MissingFeatureCategory
 gem 'google-apis-container_v1', '~> 0.43.0' # rubocop:todo Gemfile/MissingFeatureCategory
 gem 'google-apis-container_v1beta1', '~> 0.43.0' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -220,7 +220,7 @@ gem 'google-apis-androidpublisher_v3', '~> 0.34.0' # r
 gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0' # rubocop:todo Gemfile/MissingFeatureCategory
 gem 'google-apis-androidpublisher_v3', '~> 0.34.0' # rubocop:todo Gemfile/MissingFeatureCategory
 
-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
 
@@ -231,9 +231,9 @@ gem 'elasticsearch-api', '7.17.11', feature_category: 
 gem 'elasticsearch-model', '~> 7.2', feature_category: :global_search
 gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation', feature_category: :global_search
 gem 'elasticsearch-api', '7.17.11', feature_category: :global_search
-gem 'aws-sdk-core', '~> 3.202.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'aws-sdk-core', '~> 3.202' # rubocop:todo Gemfile/MissingFeatureCategory
 gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory
-gem 'aws-sdk-s3', '~> 1.159.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'aws-sdk-s3', '~> 1.159' # rubocop:todo Gemfile/MissingFeatureCategory
 gem 'faraday-typhoeus', '~> 1.1', feature_category: :global_search
 gem 'faraday_middleware-aws-sigv4', '~> 1.0.1', feature_category: :global_search
 # Used with Elasticsearch to support http keep-alive connections
@@ -271,7 +271,7 @@ group :puma do
 gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base' # rubocop:todo Gemfile/MissingFeatureCategory
 
 group :puma do
-  gem 'puma', '= 6.4.0', require: false, feature_category: :shared
+  gem 'puma', '~> 6.4.0', require: false, feature_category: :shared
   gem 'sd_notify', '~> 0.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
 end
 
@@ -279,7 +279,7 @@ gem 'state_machines-activerecord', '~> 0.8.0' # ruboco
 gem 'state_machines-activerecord', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory
 
 # Background jobs
-gem 'sidekiq', path: 'vendor/gems/sidekiq-7.2.4', require: 'sidekiq', feature_category: :scalability
+gem 'sidekiq', '~> 7.2.4', require: 'sidekiq', feature_category: :scalability
 gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability
 gem 'gitlab-sidekiq-fetcher',
   path: 'vendor/gems/sidekiq-reliable-fetch',
@@ -462,136 +462,15 @@ gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/Missi
 
 gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
 
-group :development do
-  gem 'lefthook', '~> 1.7.0', require: false, feature_category: :tooling
-  gem 'rubocop', feature_category: :tooling
-  gem 'solargraph', '~> 0.47.2', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-
-  gem 'letter_opener_web', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
-  gem 'lookbook', '~> 2.3' # rubocop:todo Gemfile/MissingFeatureCategory
-
-  # Better errors handler
-  gem 'better_errors', '~> 2.10.1' # rubocop:todo Gemfile/MissingFeatureCategory
-
-  gem 'sprite-factory', '~> 1.7' # rubocop:todo Gemfile/MissingFeatureCategory
-
-  gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory
-
-  gem 'ruby-lsp', "~> 0.17.0", require: false, feature_category: :tooling
-
-  gem 'ruby-lsp-rails', "~> 0.3.6", feature_category: :tooling
-
-  gem 'ruby-lsp-rspec', "~> 0.1.10", require: false, feature_category: :tooling
-
-  gem 'gdk-toogle', '~> 0.9', '>= 0.9.5', require: 'toogle', feature_category: :tooling
-end
-
-group :development, :test do
-  gem 'deprecation_toolkit', '~> 1.5.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-  gem 'bullet', '~> 7.1.2' # rubocop:todo Gemfile/MissingFeatureCategory
-  gem 'parser', '= 3.3.3.0', feature_category: :shared
-  gem 'pry-byebug' # rubocop:todo Gemfile/MissingFeatureCategory
-  gem 'pry-rails', '~> 0.3.9' # rubocop:todo Gemfile/MissingFeatureCategory
-  gem 'pry-shell', '~> 0.6.4' # rubocop:todo Gemfile/MissingFeatureCategory
-
-  gem 'awesome_print', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-
-  gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database
-  gem 'rspec-rails', '~> 6.1.1', feature_category: :shared
-  gem 'factory_bot_rails', '~> 6.4.3', feature_category: :tooling
-
-  # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
-  gem 'minitest', '~> 5.11.0' # rubocop:todo Gemfile/MissingFeatureCategory
-
-  gem 'spring', '~> 4.1.0' # rubocop:todo Gemfile/MissingFeatureCategory
-  gem 'spring-commands-rspec', '~> 1.0.4' # rubocop:todo Gemfile/MissingFeatureCategory
-
-  gem 'gitlab-styles', '~> 12.0.1', feature_category: :tooling
-  gem 'haml_lint', '~> 0.58', feature_category: :tooling
-
-  gem 'bundler-audit', '~> 0.9.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-
-  # Benchmarking & profiling
-  gem 'benchmark-ips', '~> 2.11.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-  gem 'benchmark-memory', '~> 0.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-
-  # 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 'crystalball', '~> 0.7.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 # rubocop:todo Gemfile/MissingFeatureCategory
-
-  gem 'png_quantizator', '~> 0.2.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-
-  gem 'parallel', '~> 1.19', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-
-  gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup' # rubocop:todo Gemfile/MissingFeatureCategory
-
-  gem 'pact', '~> 1.64' # rubocop:todo Gemfile/MissingFeatureCategory
-
-  # 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.8.0', feature_category: :shared
-
-  gem 'gitlab-housekeeper', path: 'gems/gitlab-housekeeper', feature_category: :tooling
-end
-
 group :development, :test, :danger do
   gem 'gitlab-dangerfiles', '~> 4.8.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.5.0', require: false, feature_category: :tooling
-end
-
 # Gems required in omnibus-gitlab pipeline
 group :development, :test, :omnibus do
   gem 'license_finder', '~> 7.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
 end
 
-# Gems required in various pipelines
-group :development, :test, :monorepo do
-  gem 'gitlab-rspec', path: 'gems/gitlab-rspec' # rubocop:todo Gemfile/MissingFeatureCategory
-  gem 'gitlab-rspec_flaky', path: 'gems/gitlab-rspec_flaky', feature_category: :tooling
-end
-
-group :test do
-  gem 'fuubar', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
-  gem 'rspec-retry', '~> 0.6.2', feature_category: :tooling
-  gem 'rspec_profiling', '~> 0.0.9', feature_category: :tooling
-  gem 'rspec-benchmark', '~> 0.6.0', feature_category: :tooling
-  gem 'rspec-parameterized', '~> 1.0', '>= 1.0.2', require: false, feature_category: :tooling
-  gem 'os', '~> 1.1', '>= 1.1.4', feature_category: :tooling
-
-  gem 'capybara', '~> 3.40', feature_category: :test_platform
-  gem 'capybara-screenshot', '~> 1.0.26', feature_category: :test_platform
-  gem 'selenium-webdriver', '~> 4.21', '>= 4.21.1', feature_category: :test_platform
-
-  gem 'graphlyte', '~> 1.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
-
-  gem 'shoulda-matchers', '~> 5.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-  gem 'email_spec', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
-  gem 'webmock', '~> 3.23.0', feature_category: :shared
-  gem 'rails-controller-testing' # rubocop:todo Gemfile/MissingFeatureCategory
-  gem 'concurrent-ruby', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory
-  gem 'test-prof', '~> 1.4.0', feature_category: :tooling
-  gem 'rspec_junit_formatter' # rubocop:todo Gemfile/MissingFeatureCategory
-  gem 'guard-rspec' # rubocop:todo Gemfile/MissingFeatureCategory
-  gem 'axe-core-rspec', '~> 4.9.0', feature_category: :tooling
-
-  # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
-  gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-
-  gem 'gitlab_quality-test_tooling', '~> 1.38.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
@@ -635,7 +514,7 @@ gem 'gitlab-kas-grpc', '~> 17.4.0.pre.rc1', feature_ca
 # 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 'google-protobuf', '~> 3.25', '>= 3.25.3' # rubocop:todo Gemfile/MissingFeatureCategory
 
@@ -656,7 +535,7 @@ gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfil
 gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfile/MissingFeatureCategory
 
 # Countries list
-gem 'countries', '~> 4.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'countries', '~> 4.0' # rubocop:todo Gemfile/MissingFeatureCategory
 
 gem 'retriable', '~> 3.1.2' # rubocop:todo Gemfile/MissingFeatureCategory
 
@@ -730,6 +609,11 @@ gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/Missing
 gem 'net-http', '= 0.4.1', feature_category: :shared
 
 gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory
+
+gem 'parser'
+gem 'net-smtp'
+gem 'net-pop'
+gem 'psych', '~> 3.1'
 
 gem 'gitlab-sdk', '~> 0.3.0', feature_category: :application_instrumentation