aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Fechner <mfechner@FreeBSD.org>2024-02-22 07:39:40 +0000
committerMatthias Fechner <mfechner@FreeBSD.org>2024-02-22 09:22:11 +0000
commit83fd6eb67939a7a39d3c855dbab7e48ecb3d1de6 (patch)
treeba7dcda11e387d655d49beef409f73745908bad4
parentfcba5ad028d4db07db98758525fb53929db847ca (diff)
downloadports-83fd6eb67939a7a39d3c855dbab7e48ecb3d1de6.tar.gz
ports-83fd6eb67939a7a39d3c855dbab7e48ecb3d1de6.zip
www/gitlab-ce: fix regression from 6ef57459aa715d7be45c21f1b4c6dd9bf30c5811
-rw-r--r--www/gitlab-ce/Makefile1
-rw-r--r--www/gitlab-ce/files/patch-Gemfile11
2 files changed, 11 insertions, 1 deletions
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