git: 04b93d19f5f7 - main - www/gitlab-ce: use new version of snowplow-tracker

From: Matthias Fechner <mfechner_at_FreeBSD.org>
Date: Sat, 13 Nov 2021 14:53:43 UTC
The branch main has been updated by mfechner:

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

commit 04b93d19f5f78cac3b1c2a088440e24f556f8d50
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2021-11-13 14:52:08 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2021-11-13 14:52:08 +0000

    www/gitlab-ce: use new version of snowplow-tracker
    
    The new version of snowplow-tracker does not have any dependency anymore
---
 www/gitlab-ce/Makefile            | 4 ++--
 www/gitlab-ce/files/patch-Gemfile | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index 6195812b8206..53df62b985a5 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	gitlab-ce
 PORTVERSION=	14.4.2
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	www devel
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -197,7 +197,7 @@ MY_DEPENDS=	git>=2.32.0:devel/git \
 	rubygem-gettext>=3.3<4:devel/rubygem-gettext \
 	rubygem-batch-loader>=2.0.1<2.1:devel/rubygem-batch-loader \
 	rubygem-peek-rails61>=1.1.0<2.0:devel/rubygem-peek-rails61 \
-	rubygem-snowplow-tracker>=0.6.1<0.7.0:devel/rubygem-snowplow-tracker \
+	rubygem-snowplow-tracker>=0.6.1<1:devel/rubygem-snowplow-tracker \
 	rubygem-method_source>=1.0<2:devel/rubygem-method_source \
 	rubygem-webrick>=1.6.1:www/rubygem-webrick \
 	rubygem-prometheus-client-mmap>=0.15.0<0.16.0:devel/rubygem-prometheus-client-mmap \
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index 8dfc08fa2b50..8e51c0153f2d 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig	2021-10-28 07:49:38 UTC
+--- Gemfile.orig	2021-11-08 11:58:53 UTC
 +++ Gemfile
 @@ -88,7 +88,7 @@ gem 'gpgme', '~> 2.0.19'
  # GitLab fork with several improvements to original library. For full list of changes
@@ -17,7 +17,12 @@
  gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
  
  gem 'hashie'
-@@ -332,106 +331,15 @@ gem 'snowplow-tracker', '~> 0.6.1'
+@@ -328,110 +327,19 @@ gem 'batch-loader', '~> 2.0.1'
+ gem 'peek', '~> 1.1'
+ 
+ # Snowplow events tracking
+-gem 'snowplow-tracker', '~> 0.6.1'
++gem 'snowplow-tracker', '~> 0.6'
  
  # Metrics
  gem 'method_source', '~> 1.0', require: false