diff options
Diffstat (limited to 'www/gitlab/files/patch-Gemfile')
| -rw-r--r-- | www/gitlab/files/patch-Gemfile | 45 |
1 files changed, 19 insertions, 26 deletions
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index b7fc39e4f8be..e4317e6fb580 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2025-03-11 19:30:16 UTC +--- Gemfile.orig 2025-03-19 10:41:02 UTC +++ Gemfile @@ -164,8 +164,8 @@ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', fea gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared @@ -47,18 +47,7 @@ gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', -@@ -327,8 +327,8 @@ gem 'device_detector', feature_category: :shared - gem 'device_detector', feature_category: :shared - - # Redis --gem 'redis', '~> 5.3.0', feature_category: :redis --gem 'redis-clustering', '~> 5.3.0', feature_category: :redis -+gem 'redis', '~> 5.3', feature_category: :redis -+gem 'redis-clustering', '~> 5.3', feature_category: :redis - gem 'connection_pool', '~> 2.4', feature_category: :shared - - # Redis session store -@@ -431,7 +431,7 @@ gem 'snowplow-tracker', '~> 0.8.0', feature_category: +@@ -430,7 +430,7 @@ gem 'snowplow-tracker', '~> 0.8.0', feature_category: gem 'snowplow-tracker', '~> 0.8.0', feature_category: :product_analytics # Metrics @@ -67,12 +56,12 @@ gem 'prometheus-client-mmap', '~> 1.2.8', require: 'prometheus/client', feature_category: :shared # Event-driven reactor for Ruby -@@ -473,138 +473,15 @@ gem 'warning', '~> 1.3.0', feature_category: :shared +@@ -472,138 +472,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared - gem 'warning', '~> 1.3.0', feature_category: :shared + gem 'warning', '~> 1.5.0', feature_category: :shared -group :development do -- gem 'lefthook', '~> 1.7.0', require: false, feature_category: :tooling +- gem 'lefthook', '~> 1.11.0', require: false, feature_category: :tooling - gem 'rubocop', feature_category: :tooling - gem 'solargraph', '~> 0.47.2', require: false, feature_category: :shared - @@ -147,7 +136,7 @@ - # 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 'vite_ruby', '~> 3.9.0', feature_category: :shared - - gem 'gitlab-housekeeper', path: 'gems/gitlab-housekeeper', feature_category: :tooling -end @@ -160,7 +149,7 @@ - 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 +- gem 'undercover', '~> 0.6.0', require: false, feature_category: :tooling -end - # Gems required in omnibus-gitlab pipeline @@ -187,7 +176,7 @@ - - gem 'graphlyte', '~> 1.0.0', feature_category: :shared - -- gem 'shoulda-matchers', '~> 5.1.0', require: false, feature_category: :shared +- 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 - gem 'rails-controller-testing', feature_category: :shared @@ -195,23 +184,27 @@ - gem 'test-prof', '~> 1.4.0', feature_category: :tooling - gem 'rspec_junit_formatter', feature_category: :shared - gem 'guard-rspec', feature_category: :shared -- gem 'axe-core-rspec', '~> 4.9.0', feature_category: :tooling +- gem 'axe-core-rspec', '~> 4.10.0', feature_category: :tooling - - # 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.4.0', require: false, feature_category: :tooling +- gem 'gitlab_quality-test_tooling', '~> 2.8.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 -@@ -642,13 +519,13 @@ gem 'gitaly', '~> 17.8.0', feature_category: :gitaly - gem 'gitaly', '~> 17.8.0', feature_category: :gitaly +@@ -638,16 +515,16 @@ 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 # KAS GRPC protocol definitions -gem 'gitlab-kas-grpc', '~> 17.9.0.pre.rc2', feature_category: :deployment_management -+gem 'gitlab-kas-grpc', '~> 17.9.0', 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 @@ -222,7 +215,7 @@ gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared -@@ -669,7 +546,7 @@ gem 'gitlab-net-dns', '~> 0.10.0', feature_category: : +@@ -668,7 +545,7 @@ gem 'gitlab-net-dns', '~> 0.10.0', feature_category: : gem 'gitlab-net-dns', '~> 0.10.0', feature_category: :shared # Countries list @@ -231,7 +224,7 @@ gem 'retriable', '~> 3.1.2', feature_category: :shared -@@ -750,10 +627,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc +@@ -749,10 +626,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc gem 'duo_api', '~> 1.3', feature_category: :system_access |