From nobody Wed Jan 26 10:43:36 2022 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 BC3D919844DD; Wed, 26 Jan 2022 10:43:38 +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 4JkL146zhdz58Wr; Wed, 26 Jan 2022 10:43:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643193818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+gtcDH193JktqsKq+JgL1RLf3n3gQyE6oiH/LYUAdcA=; b=pqxJqirpbAgKnYMwx+kwCt3kaydJyEJdl7rmtQxWQYPHUDu4EJgJQd+CT+5t98Aot1sYAj W9VDCbExMvmA317sLxq5ZRnyGzWkjj7SetPEVbdC2xpJDoOtSDNkVeyWw7jTBbGFaAESzf jRVROqgxQIp3YQCMstTgPZo3pVH01jnWXn02VLNe8mb7HfodWpNbpDwubVReTYZPscaq89 hzmte++dKqlBkHWiQenKALKCA1K7VSMVjSdZ99gms+bkyNxG+hM39eQ4fmyHHPJAWh38Fl oe8uAOAH5jhnjvm18KHPagL2ziqsELojXtJO1ulVOkq6YZI2AB1wmK9OLONhUg== 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 784101BB7D; Wed, 26 Jan 2022 10:43:36 +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 20QAhaop015826; Wed, 26 Jan 2022 10:43:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20QAha5B015825; Wed, 26 Jan 2022 10:43:36 GMT (envelope-from git) Date: Wed, 26 Jan 2022 10:43:36 GMT Message-Id: <202201261043.20QAha5B015825@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: d87992a6174b - main - www/gitlab-ce: fix database migration 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: d87992a6174b82811a3caf678647784d77c1c045 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643193818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+gtcDH193JktqsKq+JgL1RLf3n3gQyE6oiH/LYUAdcA=; b=JWnLv5ka3rwARYAuFvgzKh+Vdw5Tv3LaWvo2oeAZCSy5jDWa+8lHLN4aq3IoGMyeFSyQCY xuJDUli/UQcc4SgBmzoxzNofyG90Tq+5mYr5rq5LYbGebnNu7SJoawg2BAcGf2jEufJA8d gZy/Ol8/GMIUUgqWPnvpa7moDdhXKV+8tiWhk5ALNEog/d0ju6VxMF2IssDRniyTiO9gUe eg0CXvGX8wW41lSyBESR4GyEXGPIbz2UI+4BSa/M2WqvBi176isvM7c4gGcJP08DkxvT5K jusCzCCMWAoDtCZNwxpNGbhPaYPfiiuK9CxKrXTwwNtIZ+L1k8TWCPp2en8o7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643193818; a=rsa-sha256; cv=none; b=h7u9mtszxpBGRZTmvHM8VaSKzTav9cgqMCsVUJrXbqdx4LYGK0RuAWfZpQYg9mE8RrRy5Y 5n2mYUxWzIEGFw8881tZnMFhDnv2Mp7TkjTd8h2z/TmKDqMAsviGqWamWsQNNCszlSgH4w ttTVmtsN7oHUfg2+HpHGHJ82Y9MjdPCpuk2qRxbKuOBfYDvcmjRDqTh3L4RMzvBTci7S2R s+YMWHeHSb4/qO9FKn3xzUAW2989CnC6rOVwwSnvDrxvk3+FlvNbT4QoCgp+4FddqKvcS5 zR1JKArFDN7nnHPhUQqF+3SxSuhE8SUbvKYjlenbOvSvUT8OFIY/faYosW5KOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=d87992a6174b82811a3caf678647784d77c1c045 commit d87992a6174b82811a3caf678647784d77c1c045 Author: Matthias Fechner AuthorDate: 2022-01-26 10:26:57 +0000 Commit: Matthias Fechner CommitDate: 2022-01-26 10:43:02 +0000 www/gitlab-ce: fix database migration The current gitlab version misses a gem, we add it here. Refer to: https://gitlab.com/gitlab-org/gitlab/-/issues/350866 --- www/gitlab-ce/Makefile | 5 ++++- www/gitlab-ce/files/patch-Gemfile | 14 +++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index d4bb50cacec7..6d091c9fe2d6 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -13,6 +13,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # the rubygems of RUN_DEPENDS matches the order of the Gemfile # which makes maintaining this long list much easier! +# devel/rubygem-parser is required for database upgrade process +# see https://gitlab.com/gitlab-org/gitlab/-/issues/350866 MY_DEPENDS= git>=2.32.0:devel/git \ gitaly>=${PORTVERSION}:devel/gitaly \ gitlab-elasticsearch-indexer>=2.17.0:textproc/gitlab-elasticsearch-indexer \ @@ -254,7 +256,8 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-webauthn>=2.3<3:security/rubygem-webauthn \ rubygem-ipaddress>=0.8.3<0.9:net/rubygem-ipaddress \ rubygem-parslet1>=1.8<2:textproc/rubygem-parslet1 \ - rubygem-ipynbdiff>=0.3.8<0.3.9:devel/rubygem-ipynbdiff + rubygem-ipynbdiff>=0.3.8<0.3.9:devel/rubygem-ipynbdiff \ + rubygem-parser>=0:devel/rubygem-parser BUILD_DEPENDS= gem:devel/ruby-gems \ ${MY_DEPENDS} diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index 5525869a493c..5e0004d14ef5 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -26,7 +26,7 @@ gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import) gem 'hashie' -@@ -328,114 +327,13 @@ gem 'batch-loader', '~> 2.0.1' +@@ -328,115 +327,14 @@ gem 'batch-loader', '~> 2.0.1' gem 'peek', '~> 1.1' # Snowplow events tracking @@ -39,7 +39,7 @@ gem 'prometheus-client-mmap', '~> 0.15.0', require: 'prometheus/client' gem 'warning', '~> 1.2.0' -- + -group :development do - gem 'lefthook', '~> 0.7.0', require: false - gem 'solargraph', '~> 0.43', require: false @@ -139,6 +139,14 @@ - # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 - gem 'derailed_benchmarks', require: false -end - +- gem 'octokit', '~> 4.15' + # Updating this gem version here is deprecated. See: +@@ -542,3 +440,6 @@ gem 'ipaddress', '~> 0.8.3' + gem 'parslet', '~> 1.8' + + gem 'ipynbdiff', '0.3.8' ++ ++gem 'parser' ++