From nobody Sat Nov 13 14:53:43 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7AFC118500F6; Sat, 13 Nov 2021 14:53:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hrz3q2kscz3rcS; Sat, 13 Nov 2021 14:53:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2ACB315790; Sat, 13 Nov 2021 14:53:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1ADErhDj035550; Sat, 13 Nov 2021 14:53:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ADErhO0035549; Sat, 13 Nov 2021 14:53:43 GMT (envelope-from git) Date: Sat, 13 Nov 2021 14:53:43 GMT Message-Id: <202111131453.1ADErhO0035549@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: 04b93d19f5f7 - main - www/gitlab-ce: use new version of snowplow-tracker List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 04b93d19f5f78cac3b1c2a088440e24f556f8d50 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=04b93d19f5f78cac3b1c2a088440e24f556f8d50 commit 04b93d19f5f78cac3b1c2a088440e24f556f8d50 Author: Matthias Fechner AuthorDate: 2021-11-13 14:52:08 +0000 Commit: Matthias Fechner 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