git: a5e529d6a767 - main - www/gitlab: fix regression from 09d7eada6c2c214adac9780307f2dd7689ab8660

The branch main has been updated by mfechner:

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

commit a5e529d6a767023c10d083c7ad441ad464b01c1e
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2024-08-05 07:26:08 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2024-08-07 07:37:05 +0000

    www/gitlab: fix regression from 09d7eada6c2c214adac9780307f2dd7689ab8660
    
    Gitlab requires cssbundling 1.4.0.
    As changelog of cssbundling seems not to have a breaking change, allow 1.4.x.
    That patch is not approved from upstream and needs to be tested carefully.
    
    PR:             280621
---
 www/gitlab/Makefile            |  2 +-
 www/gitlab/files/patch-Gemfile | 23 ++++++++++++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index 7a27fdec9fe9..54ce7379b9dc 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -4,7 +4,7 @@ DISTVERSIONPREFIX=	v
 .if ${FLAVOR:U} == ee
 DISTVERSIONSUFFIX=	-ee
 .endif
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www devel
 
 # include patch to fix database migration
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index dd9d6e0337c8..61391c85d487 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig	2024-06-25 20:33:28 UTC
+--- Gemfile.orig	2024-07-24 01:20:50 UTC
 +++ Gemfile
 @@ -58,7 +58,7 @@ gem 'rugged', '~> 1.6' # rubocop:todo Gemfile/MissingF
  
@@ -81,7 +81,16 @@
  gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability
  gem 'gitlab-sidekiq-fetcher',
    path: 'vendor/gems/sidekiq-reliable-fetch',
-@@ -431,96 +431,10 @@ gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/Missi
+@@ -345,7 +345,7 @@ gem 'rack-proxy', '~> 0.7.7' # rubocop:todo Gemfile/Mi
+ 
+ gem 'rack-proxy', '~> 0.7.7' # rubocop:todo Gemfile/MissingFeatureCategory
+ 
+-gem 'cssbundling-rails', '1.4.0', feature_category: :shared
++gem 'cssbundling-rails', '~> 1.4.0', feature_category: :shared
+ gem 'terser', '1.0.2' # rubocop:todo Gemfile/MissingFeatureCategory
+ 
+ gem 'click_house-client', path: 'gems/click_house-client', require: 'click_house/client' # rubocop:todo Gemfile/MissingFeatureCategory
+@@ -433,96 +433,10 @@ gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/Missi
  
  gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
  
@@ -178,7 +187,7 @@
  # Gems required in omnibus-gitlab pipeline
  group :development, :test, :omnibus do
    gem 'license_finder', '~> 7.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-@@ -532,36 +446,6 @@ end
+@@ -534,36 +448,6 @@ end
    gem 'gitlab-rspec_flaky', path: 'gems/gitlab-rspec_flaky', feature_category: :tooling
  end
  
@@ -215,7 +224,7 @@
  gem 'octokit', '~> 8.1', feature_category: :importers
  
  gem 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :shared
-@@ -594,7 +478,7 @@ gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/Mis
+@@ -596,7 +480,7 @@ gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/Mis
  gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
  
  # Gitaly GRPC protocol definitions
@@ -224,7 +233,7 @@
  
  # KAS GRPC protocol definitions
  gem 'kas-grpc', '~> 0.5.0', feature_category: :deployment_management
-@@ -620,7 +504,7 @@ gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfil
+@@ -622,7 +506,7 @@ gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfil
  gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfile/MissingFeatureCategory
  
  # Countries list
@@ -233,7 +242,7 @@
  
  gem 'retriable', '~> 3.1.2' # rubocop:todo Gemfile/MissingFeatureCategory
  
-@@ -686,6 +570,7 @@ gem 'telesignenterprise', '~> 2.2' # rubocop:todo Gemf
+@@ -688,6 +572,7 @@ gem 'telesignenterprise', '~> 2.2' # rubocop:todo Gemf
  gem 'telesignenterprise', '~> 2.2' # rubocop:todo Gemfile/MissingFeatureCategory
  
  # BufferedIO patch
@@ -241,7 +250,7 @@
  # Updating this version will require updating scripts/allowed_warnings.txt
  gem 'net-protocol', '~> 0.1.3' # rubocop:todo Gemfile/MissingFeatureCategory
  
-@@ -694,5 +579,11 @@ gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/Missing
+@@ -696,5 +581,11 @@ gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/Missing
  gem 'net-http', '= 0.4.1', feature_category: :shared
  
  gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory