--- Gemfile.orig 2026-06-17 09:26:52 UTC +++ Gemfile @@ -168,7 +168,7 @@ gem 'graphql', '2.6.3', feature_category: :api # GraphQL API gem 'graphql', '2.6.3', 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 # IAM service gRPC client stubs @@ -303,7 +303,7 @@ gem 'state_machines-activerecord', '~> 0.100.0', featu gem 'state_machines-activerecord', '~> 0.100.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Background jobs -gem 'sidekiq', path: 'vendor/gems/sidekiq', require: 'sidekiq', feature_category: :scalability +gem 'sidekiq', '>= 7.3.9', require: 'sidekiq', feature_category: :scalability gem 'sidekiq-cron', '~> 2.3.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', @@ -490,128 +490,6 @@ gem 'warning', '~> 1.5.0', feature_category: :shared # gem 'warning', '~> 1.5.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -group :development do - gem 'lefthook', '~> 1.13.0', require: false, feature_category: :tooling - gem 'rubocop', feature_category: :tooling, require: false - gem 'debug', '~> 1.11.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - - gem 'solargraph', '~> 0.58.0', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'solargraph-rspec', '~> 0.5.1', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - - gem 'letter_opener_web', '~> 3.0.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'lookbook', '~> 2.3', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - - gem 'sprite-factory', '~> 1.7', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - - gem 'listen', '~> 3.7', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - - gem 'ruby-lsp', "~> 0.26.4", require: false, feature_category: :tooling - - gem 'ruby-lsp-rails', "~> 0.4.8", feature_category: :tooling - - gem 'ruby-lsp-rspec', "~> 0.1.28", require: false, feature_category: :tooling - - gem 'gdk-toogle', '~> 0.9', '>= 0.9.5', require: 'toogle', feature_category: :tooling - - gem 'grpc-tools', '~> 1.80.0', feature_category: :system_access - - # Used by - # * `lib/tasks/gitlab/security/update_banned_ssh_keys.rake` - # * `lib/tasks/gitlab/db/migration_squash.rake` - # * `lib/gitlab/diff/diff_refs.rb` - gem 'git', '~> 1.8', feature_category: :source_code_management -end - -group :development, :test do - gem 'bullet', '~> 8.0.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'parser', '= 3.3.11.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'pry-byebug', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'pry-rails', '~> 0.3.9', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'pry-shell', '~> 0.6.4', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - - gem 'amazing_print', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - - gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database - gem 'rspec-rails', '~> 7.1.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - 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 # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - - gem 'spring', '~> 4.3.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'spring-commands-rspec', '~> 1.0.4', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - - gem 'gitlab-styles', '~> 14.1', feature_category: :tooling, require: false - gem 'haml_lint', '~> 0.58', feature_category: :tooling, require: false - - # Benchmarking & profiling - gem 'benchmark-ips', '~> 2.14.0', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'benchmark-memory', '~> 0.1', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - - gem 'knapsack', '~> 4.0.0', feature_category: :tooling - gem 'gitlab-crystalball', '~> 1.1.3', 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 # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - - gem 'png_quantizator', '~> 0.2.1', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - - gem 'parallel', '~> 1.19', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - - gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - - gem 'pact', '~> 1.64', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - - gem 'gitlab-housekeeper', path: 'gems/gitlab-housekeeper', feature_category: :tooling - - gem 'yard', '~> 0.9', require: false, feature_category: :tooling - - # Gems required for Dangerfile - gem 'gitlab-dangerfiles', '~> 4.11.1', require: false, feature_category: :tooling - - # Gems required for code coverage - gem 'simplecov', '~> 0.22', require: false, feature_category: :tooling - gem 'simplecov-lcov', '~> 0.8.0', require: false, feature_category: :tooling - gem 'simplecov-cobertura', '~> 3.1.0', require: false, feature_category: :tooling - gem 'undercover', '~> 0.8.0', require: false, feature_category: :tooling - - # Gems required in various pipelines - gem 'gitlab-rspec', path: 'gems/gitlab-rspec', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'gitlab-rspec_flaky', path: 'gems/gitlab-rspec_flaky', feature_category: :tooling -end - -group :test do - 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', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - - gem 'shoulda-matchers', '~> 6.4.0', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'email_spec', '~> 2.3.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'webmock', '~> 3.26.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'rails-controller-testing', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'concurrent-ruby', '~> 1.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'test-prof', '~> 1.6.0', feature_category: :tooling - gem 'rspec_junit_formatter', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'guard-rspec', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'axe-core-rspec', '~> 4.10.0', feature_category: :tooling - gem 'state_machines-rspec', '~> 0.6', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - - # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 - gem 'derailed_benchmarks', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - - gem 'gitlab_quality-test_tooling', '~> 3.16.0', require: false, feature_category: :tooling - - # Test execution result export - gem 'gitlab-rspec-metrics-exporter', '~> 0.2.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 @@ -674,7 +552,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: : gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Countries list -gem 'countries', '~> 4.0.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +gem 'countries', '~> 4.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 gem 'retriable', '~> 3.1.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 @@ -756,11 +634,16 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc gem 'duo_api', '~> 1.3', feature_category: :system_access +gem 'parser' +gem 'net-smtp' +gem 'net-pop' +gem 'psych' + gem 'gitlab-sdk', '~> 0.3.0', feature_category: :application_instrumentation gem 'paper_trail', '~> 16.0', feature_category: :workspaces -gem "i18n_data", "~> 0.13.1", feature_category: :system_access +gem "i18n_data", "~> 0.13", feature_category: :system_access gem "gitlab-cloud-connector", "~> 1.51", require: 'gitlab/cloud_connector', feature_category: :plan_provisioning @@ -773,3 +656,4 @@ gem 'license_finder', '~> 7.0', require: false, featur # Gems required in omnibus-gitlab pipeline gem 'license_finder', '~> 7.0', require: false, feature_category: :build +gem 'gitlab-dangerfiles', '~> 4.11.1', require: false, feature_category: :tooling