From 1ca2b6ee37797cf857b6201b5265e9f78628ac55 Mon Sep 17 00:00:00 2001 From: Matthias Fechner Date: Tue, 5 Nov 2024 09:34:22 +0200 Subject: www/gitlab: fix regression from 372f5ebfd99a96b7060145c632e350b5870b8c7d ===> gitlab-ce-17.5.1_1 depends on package: rubygem-webrick>=1.8.1<1.9 - not found *** Error code 1 --- www/gitlab/files/patch-Gemfile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'www/gitlab/files') diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index a8c5098e445b..8254fe335591 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2024-10-16 08:01:39 UTC +--- Gemfile.orig 2024-10-22 18:38:20 UTC +++ Gemfile @@ -160,7 +160,7 @@ gem 'graphql', '~> 2.3.14', feature_category: :api @@ -45,6 +45,15 @@ gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', +@@ -424,7 +424,7 @@ gem 'snowplow-tracker', '~> 0.8.0' # rubocop:todo Gemf + gem 'snowplow-tracker', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory + + # Metrics +-gem 'webrick', '~> 1.8.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory ++gem 'webrick', '~> 1.8', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'prometheus-client-mmap', '~> 1.1', '>= 1.1.1', require: 'prometheus/client' # rubocop:todo Gemfile/MissingFeatureCategory + + # Event-driven reactor for Ruby @@ -466,136 +466,15 @@ gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/Missi gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory -- cgit v1.2.3