git: 83fd6eb67939 - main - www/gitlab-ce: fix regression from 6ef57459aa715d7be45c21f1b4c6dd9bf30c5811

From: Matthias Fechner <mfechner_at_FreeBSD.org>
Date: Thu, 22 Feb 2024 09:22:24 UTC
The branch main has been updated by mfechner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=83fd6eb67939a7a39d3c855dbab7e48ecb3d1de6

commit 83fd6eb67939a7a39d3c855dbab7e48ecb3d1de6
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2024-02-22 07:39:40 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2024-02-22 09:22:11 +0000

    www/gitlab-ce: fix regression from 6ef57459aa715d7be45c21f1b4c6dd9bf30c5811
---
 www/gitlab-ce/Makefile            |  1 +
 www/gitlab-ce/files/patch-Gemfile | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index 9ad79bd0bb4f..7a2558609854 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	gitlab-ce
 PORTVERSION=	16.8.3
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www devel
 
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index 3e6bc6165173..e950aad1385d 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig	2024-02-07 07:58:11 UTC
+--- Gemfile.orig	2024-02-20 20:25:18 UTC
 +++ Gemfile
 @@ -58,7 +58,7 @@ gem 'neighbor', '~> 0.2.3' # rubocop:todo Gemfile/Miss
  
@@ -41,6 +41,15 @@
  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
  
+@@ -241,7 +241,7 @@ gem 'rack', '~> 2.2.8' # rubocop:todo Gemfile/MissingF
+ gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base' # rubocop:todo Gemfile/MissingFeatureCategory
+ 
+ group :puma do
+-  gem 'puma', '= 6.4.0', require: false, feature_category: :shared
++  gem 'puma', '~> 6.4.0', require: false, feature_category: :shared
+   gem 'sd_notify', '~> 0.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
+ end
+ 
 @@ -252,7 +252,7 @@ gem 'state_machines-activerecord', '~> 0.8.0' # ruboco
  gem 'acts-as-taggable-on', '~> 10.0' # rubocop:todo Gemfile/MissingFeatureCategory