diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2025-02-08 07:27:09 +0200 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2025-02-08 07:27:50 +0200 |
| commit | 7be30de9205977958b8c92157dc31b9f68e1e0e2 (patch) | |
| tree | 8d365181ac251f5eae4fa21c9a6f869a44b0f525 /www/gitlab | |
| parent | x11-drivers/xf86-video-vmware: Drop dependency on obsolete GCC (diff) | |
www/gitlab: fix problem due to puma upgrade to 6.6.0
Diffstat (limited to 'www/gitlab')
| -rw-r--r-- | www/gitlab/Makefile.common | 2 | ||||
| -rw-r--r-- | www/gitlab/files/patch-Gemfile | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index 0872936338d9..faaf4720e7eb 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,5 +1,5 @@ GITLAB_VERSION= 17.8.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 2a6efd049cd3..3c6fe6426d7a 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2025-01-15 09:55:34 UTC +--- Gemfile.orig 2025-01-22 04:13:11 UTC +++ Gemfile @@ -164,7 +164,7 @@ gem 'graphql', '~> 2.4.1', feature_category: :api @@ -32,7 +32,7 @@ group :puma do - gem 'puma', '= 6.5.0', require: false, feature_category: :shared -+ gem 'puma', '~> 6.5.0', require: false, feature_category: :shared ++ gem 'puma', '~> 6.5', require: false, feature_category: :shared gem 'sd_notify', '~> 0.1.0', require: false, feature_category: :shared end |