diff options
Diffstat (limited to 'www/gitlab/files/patch-Gemfile')
| -rw-r--r-- | www/gitlab/files/patch-Gemfile | 49 |
1 files changed, 19 insertions, 30 deletions
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index 7943be7c3489..f995a6f85547 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,6 +1,6 @@ ---- Gemfile.orig 2025-08-20 06:43:08 UTC +--- Gemfile.orig 2025-11-11 08:08:24 UTC +++ Gemfile -@@ -165,7 +165,7 @@ gem 'graphql', '2.5.11', feature_category: :api +@@ -169,7 +169,7 @@ gem 'graphql', '2.5.11', feature_category: :api # GraphQL API gem 'graphql', '2.5.11', feature_category: :api @@ -9,7 +9,7 @@ gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api # Cells -@@ -295,7 +295,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature +@@ -299,7 +299,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature gem 'state_machines-activerecord', '~> 0.8.0', feature_category: :shared # Background jobs @@ -18,13 +18,14 @@ gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', -@@ -468,148 +468,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared +@@ -477,141 +477,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared gem 'warning', '~> 1.5.0', feature_category: :shared -group :development do -- gem 'lefthook', '~> 1.12.0', require: false, feature_category: :tooling -- gem 'rubocop', feature_category: :tooling +- 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 - - gem 'solargraph', '~> 0.54.0', require: false, feature_category: :shared - gem 'solargraph-rspec', '~> 0.5.1', require: false, feature_category: :shared @@ -39,11 +40,11 @@ - - gem 'listen', '~> 3.7', feature_category: :shared - -- gem 'ruby-lsp', "~> 0.23.0", require: false, feature_category: :tooling +- gem 'ruby-lsp', "~> 0.26.0", require: false, feature_category: :tooling - -- gem 'ruby-lsp-rails', "~> 0.3.6", feature_category: :tooling +- gem 'ruby-lsp-rails', "~> 0.4.8", feature_category: :tooling - -- gem 'ruby-lsp-rspec', "~> 0.1.10", require: false, feature_category: :tooling +- gem 'ruby-lsp-rspec', "~> 0.1.27", require: false, feature_category: :tooling - - gem 'gdk-toogle', '~> 0.9', '>= 0.9.5', require: 'toogle', feature_category: :tooling - @@ -61,7 +62,7 @@ - gem 'pry-rails', '~> 0.3.9', feature_category: :shared - gem 'pry-shell', '~> 0.6.4', feature_category: :shared - -- gem 'awesome_print', require: false, feature_category: :shared +- gem 'amazing_print', require: false, feature_category: :shared - - gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database - gem 'rspec-rails', '~> 7.1.0', feature_category: :shared @@ -80,9 +81,6 @@ - gem 'benchmark-ips', '~> 2.14.0', require: false, feature_category: :shared - gem 'benchmark-memory', '~> 0.1', require: false, feature_category: :shared - -- # 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 'gitlab-crystalball', '~> 1.1.0', require: false, feature_category: :tooling - gem 'test_file_finder', '~> 0.3.1', feature_category: :tooling @@ -97,11 +95,6 @@ - - gem 'pact', '~> 1.64', feature_category: :shared - -- # 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.9.0', feature_category: :shared -- - gem 'gitlab-housekeeper', path: 'gems/gitlab-housekeeper', feature_category: :tooling - - gem 'yard', '~> 0.9', require: false, feature_category: :tooling @@ -114,7 +107,7 @@ -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 'simplecov-cobertura', '~> 3.1.0', require: false, feature_category: :tooling - gem 'undercover', '~> 0.7.0', require: false, feature_category: :tooling -end - @@ -161,26 +154,22 @@ - # 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.18.0', require: false, feature_category: :tooling +- gem 'gitlab_quality-test_tooling', '~> 2.20.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,10 +510,10 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside +@@ -645,7 +519,7 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat # Gitaly GRPC protocol definitions --gem 'gitaly', '~> 18.2.0', feature_category: :gitaly -+gem 'gitaly', '~> 18.2', feature_category: :gitaly +-gem 'gitaly', '~> 18.4.0.pre.rc1', feature_category: :gitaly ++gem 'gitaly', '~> 18.4', feature_category: :gitaly # KAS GRPC protocol definitions --gem 'gitlab-kas-grpc', '~> 18.2.0', feature_category: :deployment_management -+gem 'gitlab-kas-grpc', '~> 18.2', feature_category: :deployment_management - - gem 'grpc', '~> 1.74.0', feature_category: :shared - -@@ -669,7 +536,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: : + gem 'gitlab-kas-grpc', '~> 18.5.0-rc4', feature_category: :deployment_management +@@ -671,7 +545,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: : gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :shared # Countries list @@ -189,7 +178,7 @@ gem 'retriable', '~> 3.1.2', feature_category: :shared -@@ -750,10 +617,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc +@@ -756,10 +630,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc gem 'duo_api', '~> 1.3', feature_category: :system_access |