git: 20268617649e - main - www/gitlab-ce: fix build problem due to dependency change

From: Matthias Fechner <mfechner_at_FreeBSD.org>
Date: Tue, 28 Nov 2023 06:00:37 UTC
The branch main has been updated by mfechner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=20268617649e05fbaa7b396b93c2df5367ddef5f

commit 20268617649e05fbaa7b396b93c2df5367ddef5f
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2023-11-28 05:28:24 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2023-11-28 06:00:21 +0000

    www/gitlab-ce: fix build problem due to dependency change
    
    Relaxe the version restriction for aws-sdk-s3.
    This fixes regression from 69027ee7a067d387ebc78fdfae2be8aec385330a
---
 www/gitlab-ce/files/patch-Gemfile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index e45a53a12844..093ff686fa1b 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -38,15 +38,18 @@
  gem 'google-apis-compute_v1', '~> 0.57.0' # rubocop:todo Gemfile/MissingFeatureCategory
  gem 'google-apis-container_v1', '~> 0.43.0' # rubocop:todo Gemfile/MissingFeatureCategory
  gem 'google-apis-container_v1beta1', '~> 0.43.0' # rubocop:todo Gemfile/MissingFeatureCategory
-@@ -196,7 +196,7 @@ gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/Missi
+@@ -196,9 +196,9 @@ gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/Missi
  gem 'elasticsearch-model', '~> 7.2' # rubocop:todo Gemfile/MissingFeatureCategory
  gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' # rubocop:todo Gemfile/MissingFeatureCategory
  gem 'elasticsearch-api',   '7.13.3' # rubocop:todo Gemfile/MissingFeatureCategory
 -gem 'aws-sdk-core', '~> 3.185.1' # rubocop:todo Gemfile/MissingFeatureCategory
 +gem 'aws-sdk-core', '~> 3.185' # rubocop:todo Gemfile/MissingFeatureCategory
  gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory
- gem 'aws-sdk-s3', '~> 1.136.0' # rubocop:todo Gemfile/MissingFeatureCategory
+-gem 'aws-sdk-s3', '~> 1.136.0' # rubocop:todo Gemfile/MissingFeatureCategory
++gem 'aws-sdk-s3', '~> 1.136' # rubocop:todo Gemfile/MissingFeatureCategory
  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
+ 
 @@ -385,80 +385,10 @@ gem 'prometheus-client-mmap', '~> 0.28', '>= 0.28.1', 
  
  gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory