git: 3f96b1a7b333 - 2024Q4 - www/gitlab: fix regression from 372f5ebfd99a96b7060145c632e350b5870b8c7d

The branch 2024Q4 has been updated by mfechner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3f96b1a7b333207b700c94f5425341c765ce9139

commit 3f96b1a7b333207b700c94f5425341c765ce9139
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2024-11-05 07:34:22 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2024-11-15 15:56:44 +0000

    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
    
    (cherry picked from commit 1ca2b6ee37797cf857b6201b5265e9f78628ac55)
---
 www/gitlab/Makefile            |  2 +-
 www/gitlab/Makefile.common     |  2 +-
 www/gitlab/files/patch-Gemfile | 11 ++++++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index 0f2eae8a1f53..f30b1e8d9251 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -223,7 +223,7 @@ MY_DEPENDS=	git>=2.41.0:devel/git \
 	rubygem-tty-prompt>=0.23<1:devel/rubygem-tty-prompt \
 	rubygem-peek-rails70>=1.1<2.0:devel/rubygem-peek-rails70 \
 	rubygem-snowplow-tracker>=0.8.0<1:devel/rubygem-snowplow-tracker \
-	rubygem-webrick>=1.8.1<1.9:www/rubygem-webrick \
+	rubygem-webrick>=1.8.1<1.10:www/rubygem-webrick \
 	rubygem-prometheus-client-mmap>=1.1.1<2:devel/rubygem-prometheus-client-mmap \
 	rubygem-async212>=2.12.1<2.13:devel/rubygem-async212 \
 	rubygem-gitlab-security_report_schemas>=0.1.2.min15.0.0.max15.2.1<0.1.2.min15.0.0.max15.2.2:devel/rubygem-gitlab-security_report_schemas \
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index 4dcefc11a462..b33919892445 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,5 +1,5 @@
 GITLAB_VERSION=		17.5.1
-GITLAB_PORTREVISION=	1
+GITLAB_PORTREVISION=	2
 
 # Git version gitaly should use (from gitlab mirror)
 # Find current tag from Makefile and .gitlab-ci.yaml
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