From 9630bdc16b3e7f9c75cb18c2bf42457a8cea5655 Mon Sep 17 00:00:00 2001 From: Matthias Fechner Date: Sat, 15 Mar 2025 10:24:44 +0200 Subject: www/gitlab: fix regression from 40d54199a8b5b902f127d6f3db01ecc250586dc3 Relaxe redis dependency, regarding the redis changelog, there is no breaking change in the new version. As the redis gem is also used by rails it does not make sense to duplicate the complete rails ports for gitlab. --- www/gitlab/Makefile | 4 ++-- www/gitlab/files/patch-Gemfile | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'www/gitlab') diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 36c04d3649bb..d2291dc01df7 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -179,8 +179,8 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-version_sorter>=2.3<3:textproc/rubygem-version_sorter \ rubygem-js_regex>=3.8<4.0:textproc/rubygem-js_regex \ rubygem-device_detector>=0:devel/rubygem-device_detector \ - rubygem-redis>=5.3.0<5.4:databases/rubygem-redis \ - rubygem-redis-clustering>=5.3.0<5.4:databases/rubygem-redis-clustering \ + rubygem-redis>=5.4.0<5.5:databases/rubygem-redis \ + rubygem-redis-clustering>=5.4.0<5.5:databases/rubygem-redis-clustering \ rubygem-connection_pool>=2.5.0<3.0:net/rubygem-connection_pool \ rubygem-redis-actionpack-rails70>=5.5.0<5.6:databases/rubygem-redis-actionpack-rails70 \ rubygem-discordrb-webhooks>=3.5<4.0:net-im/rubygem-discordrb-webhooks \ diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index 90d16ba77666..b7fc39e4f8be 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -47,6 +47,17 @@ gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', +@@ -327,8 +327,8 @@ gem 'device_detector', feature_category: :shared + gem 'device_detector', feature_category: :shared + + # Redis +-gem 'redis', '~> 5.3.0', feature_category: :redis +-gem 'redis-clustering', '~> 5.3.0', feature_category: :redis ++gem 'redis', '~> 5.3', feature_category: :redis ++gem 'redis-clustering', '~> 5.3', feature_category: :redis + gem 'connection_pool', '~> 2.4', feature_category: :shared + + # Redis session store @@ -431,7 +431,7 @@ gem 'snowplow-tracker', '~> 0.8.0', feature_category: gem 'snowplow-tracker', '~> 0.8.0', feature_category: :product_analytics -- cgit v1.2.3