mirror of
https://git.freebsd.org/ports.git
synced 2025-06-04 12:26:27 -04:00
Changelog: https://about.gitlab.com/releases/2024/01/25/critical-security-release-gitlab-16-8-1-released/
222 lines
12 KiB
Text
222 lines
12 KiB
Text
--- Gemfile.orig 2024-01-24 16:26:54 UTC
|
|
+++ Gemfile
|
|
@@ -58,7 +58,7 @@ gem 'neighbor', '~> 0.2.3' # rubocop:todo Gemfile/Miss
|
|
|
|
gem 'rugged', '~> 1.6' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
|
|
-gem 'faraday', '~> 1.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
+gem 'faraday', '>= 1.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
gem 'marginalia', '~> 1.11.1' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
|
|
# Authorization
|
|
@@ -78,8 +78,8 @@ gem 'omniauth-azure-activedirectory-v2', '~> 2.0' # ru
|
|
gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md # rubocop:todo Gemfile/MissingFeatureCategory
|
|
gem 'omniauth-dingtalk-oauth2', '~> 1.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
gem 'omniauth-alicloud', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
-gem 'omniauth-facebook', '~> 4.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
-gem 'omniauth-github', '2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
+gem 'omniauth-facebook', '>= 4.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
+gem 'omniauth-github', '~> 2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md # rubocop:todo Gemfile/MissingFeatureCategory
|
|
gem 'omniauth-google-oauth2', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
gem 'omniauth-oauth2-generic', '~> 0.2.2' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
@@ -90,7 +90,7 @@ gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/o
|
|
gem 'omniauth_openid_connect', '~> 0.6.1' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
# Locked until Ruby 3.0 upgrade since upgrading will pull in an updated net-smtp gem.
|
|
# See https://docs.gitlab.com/ee/development/emails.html#rationale.
|
|
-gem 'openid_connect', '= 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
+gem 'openid_connect', '= 1.3.1' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md # rubocop:todo Gemfile/MissingFeatureCategory
|
|
gem 'omniauth-atlassian-oauth2', '~> 0.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
gem 'rack-oauth2', '~> 1.21.3' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
@@ -203,9 +203,9 @@ gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/Missi
|
|
gem 'elasticsearch-model', '~> 7.2' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
gem 'elasticsearch-api', '7.13.3' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
-gem 'aws-sdk-core', '~> 3.190.2' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
+gem 'aws-sdk-core', '~> 3.190' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
-gem 'aws-sdk-s3', '~> 1.142.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
+gem 'aws-sdk-s3', '~> 1.142' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # rubocop:todo Gemfile/MissingFeatureCategory
|
|
|
|
@@ -392,134 +392,15 @@ gem 'prometheus-client-mmap', '~> 1.1', require: 'prom
|
|
|
|
gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
|
|
-group :development do
|
|
- gem 'lefthook', '~> 1.5.5', 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', '~> 2.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
- gem 'lookbook', '~> 2.2' # 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.13.2", require: false, feature_category: :tooling
|
|
-
|
|
- gem 'ruby-lsp-rails', "~> 0.2.8", feature_category: :tooling
|
|
-
|
|
- gem 'ruby-lsp-rspec', "~> 0.1.8", require: false, 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.3.0.2' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
- 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.1.0', feature_category: :database
|
|
- gem 'factory_bot_rails', '~> 6.4.3' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
- gem 'rspec-rails', '~> 6.1.0', feature_category: :shared
|
|
-
|
|
- # 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', '~> 11.0.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
|
|
-
|
|
- gem 'haml_lint', '~> 0.53', require: false # rubocop:todo Gemfile/MissingFeatureCategory
|
|
- 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', '~> 2.9', require: false # rubocop:todo Gemfile/MissingFeatureCategory
|
|
-
|
|
- gem 'knapsack', '~> 1.21.1', feature_category: :tooling
|
|
- gem 'crystalball', '~> 0.7.0', require: false, feature_category: :tooling
|
|
- gem 'test_file_finder', '~> 0.2.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.5.0', feature_category: :shared
|
|
-
|
|
- gem 'gitlab-housekeeper', path: 'gems/gitlab-housekeeper', feature_category: :tooling
|
|
-end
|
|
-
|
|
group :development, :test, :danger do
|
|
gem 'gitlab-dangerfiles', '~> 4.6.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.4.4', 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.6', feature_category: :tooling
|
|
- gem 'rspec-benchmark', '~> 0.6.0', feature_category: :tooling
|
|
- gem 'rspec-parameterized', '~> 1.0', require: false, feature_category: :tooling
|
|
- gem 'os', '~> 1.1', feature_category: :tooling
|
|
-
|
|
- gem 'capybara', '~> 3.39', '>= 3.39.2' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
- gem 'capybara-screenshot', '~> 1.0.26' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
- gem 'selenium-webdriver', '~> 4.16' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
-
|
|
- 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.19.1' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
- gem 'rails-controller-testing' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
- gem 'concurrent-ruby', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
- gem 'test-prof', '~> 1.3.1' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
- gem 'rspec_junit_formatter' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
- gem 'guard-rspec' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
- gem 'axe-core-rspec', '~> 4.8.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.11.0', require: false, feature_category: :tooling
|
|
-end
|
|
-
|
|
gem 'octokit', '~> 6.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
|
|
gem 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :shared
|
|
@@ -552,12 +433,12 @@ gem 'ssh_data', '~> 1.3' # rubocop:todo Gemfile/Missin
|
|
gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
|
|
# Gitaly GRPC protocol definitions
|
|
-gem 'gitaly', '~> 16.7.0-rc1', feature_category: :gitaly
|
|
+gem 'gitaly', '~> 16.7', feature_category: :gitaly
|
|
|
|
# KAS GRPC protocol definitions
|
|
gem 'kas-grpc', '~> 0.3.0', feature_category: :deployment_management
|
|
|
|
-gem 'grpc', '~> 1.58.0' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
+gem 'grpc', '~> 1.58' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
|
|
gem 'google-protobuf', '~> 3.25', '>= 3.25.2' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
|
|
@@ -578,7 +459,7 @@ gem 'grape_logging', '~> 1.8', feature_category: :api
|
|
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
|
|
|
|
@@ -644,6 +525,7 @@ gem 'app_store_connect' # rubocop:todo Gemfile/Missing
|
|
gem 'telesignenterprise', '~> 2.2' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
|
|
# BufferedIO patch
|
|
+
|
|
# Updating this version will require updating scripts/allowed_warnings.txt
|
|
gem 'net-protocol', '~> 0.1.3' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
# Lock this until we make DNS rebinding work with the updated net-http:
|
|
@@ -651,5 +533,11 @@ gem 'net-protocol', '~> 0.1.3' # rubocop:todo Gemfile/
|
|
gem 'net-http', '= 0.1.1' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
|
|
gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory
|
|
+
|
|
+gem 'parser'
|
|
+gem 'net-smtp'
|
|
+gem 'net-pop'
|
|
+gem 'psych', '~> 3.1'
|
|
+
|
|
|
|
gem 'gitlab-sdk', feature_category: :application_instrumentation
|