From nobody Fri May 27 19:17:54 2022 X-Original-To: dev-commits-ports-all@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 64FC61B4AEC1; Fri, 27 May 2022 19:17:54 +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 4L8vhf2PXVz4nSc; Fri, 27 May 2022 19:17:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653679074; 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=Ri9jTRWzP+D/5wHwAJEgV7IF2o/DyTbtIzibVGOyfiA=; b=YWWlWQKo49ojRUns0jemHl+RVRoHntCWLDtO0FeN7lpXU8f3DPV19byZHNppaXE1q5ePtu 0NMzF3Axgskjrhlz9ojEhAuzvOYO2JPZkT2mcGJzIriFqhw0XhZuW1CqkoIs4dJnCoIlKj 8w49Ojz8KdPmXs5hI6AcC+lqnVQZW/76+3kPV+Gn1YuYAFkhIWykPuYJpik2GB8YUXAk0o 3decyhbkNkSs6NxZKaPiFOBxev5NXZKhmHoDTCihiPxUUmRKNdXi+FutzmWxeblTErbaQl e0kGZcZuWLdPv3fQ1h+pCOUe5oDH4WcXsdCLvw8IPcbcOSDeoQsQgwYI8ur1KA== 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 2EA7827E62; Fri, 27 May 2022 19:17:54 +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 24RJHsUq027137; Fri, 27 May 2022 19:17:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24RJHsZU027136; Fri, 27 May 2022 19:17:54 GMT (envelope-from git) Date: Fri, 27 May 2022 19:17:54 GMT Message-Id: <202205271917.24RJHsZU027136@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: 35d750f806d4 - main - www/gitlab-ce: fixed broken patch file List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 35d750f806d4539ed73ccc03bc3d2e4cc14e9afa Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653679074; 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=Ri9jTRWzP+D/5wHwAJEgV7IF2o/DyTbtIzibVGOyfiA=; b=bqXfXQCwPDLMe19VHi2NINEbfEF/39ysUggMbSI0W1AmN5YwvCKd2tPXHcQ6rJ3vKHKm5h G1/2HKpc9dUu/0fq7M1kkD51ULuGsSujQKipwtQzf0t9x8cAeTBLJ8qXFZH/VZrCYX9L+h gvZKFFG401a3GeC3PwQp4/jGQKy/HvcLpLRDwcWiIYrELf7V3dT2CeThGp9cc5XYTAM3YC x5mRr2u7YkMgHGjeCM2ccon4aWwfbdYIyxGQME2HMq8HSFIETtNlR6swP9I5yAssbqlYD7 Ybpd83/PNhs8fzESRCwS1ExaARLk+M68Sex1n1VzrfBJiL2OJuEvpdI1rEtnSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653679074; a=rsa-sha256; cv=none; b=UY/I9KQNfXX7h7pnKEy8zsBPkmr0UQrgWf8eqO1eH4ucw83WZMLCfkAqyIxpZKVhgx68ub AHGna/YyxPCZ/JzdATxAr9oJxiIiTXsZB4+0onYW/6lxvY4rX1x25Ho6AvGzAEL+WNcvqj P/cz72NI6JR932m8qYd/2FE5SCNxJU571Rc7/W1C1gKSreY+zjyqW9ElyKsyYFVmkE2hfq Q1o2YPH2tXJX9U6AhUUUtLGHKht1/BUlfFK9Ny0JfSBFKhgAd9as+cFkST/Gwe/wZwaDA7 5kFjwwt9IjYe2Q7WwtyFIel20k4aNizqy3voinxRfZAAA9DcAY9/Rj0jhbNC/Q== 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=35d750f806d4539ed73ccc03bc3d2e4cc14e9afa commit 35d750f806d4539ed73ccc03bc3d2e4cc14e9afa Author: Matthias Fechner AuthorDate: 2022-05-27 19:17:26 +0000 Commit: Matthias Fechner CommitDate: 2022-05-27 19:17:48 +0000 www/gitlab-ce: fixed broken patch file --- www/gitlab-ce/files/patch-Gemfile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index 5bd8578f8516..5e293c0db110 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,4 +1,4 @@ ---- Gemfile.orig 2022-05-20 13:56:26 UTC +--- Gemfile.orig 2022-05-27 19:14:13 UTC +++ Gemfile @@ -2,9 +2,9 @@ @@ -30,7 +30,7 @@ # Colored output to console gem 'rainbow', '~> 3.0' -@@ -334,87 +334,15 @@ gem 'batch-loader', '~> 2.0.1' +@@ -334,87 +334,19 @@ gem 'batch-loader', '~> 2.0.1' gem 'peek', '~> 1.1' # Snowplow events tracking @@ -106,6 +106,10 @@ - gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup' -end - + group :development, :test, :danger do + gem 'gitlab-dangerfiles', '~> 3.0', require: false + end + -group :development, :test, :coverage do - gem 'simplecov', '~> 0.21', require: false - gem 'simplecov-lcov', '~> 0.8.0', require: false @@ -116,7 +120,7 @@ # Gems required in omnibus-gitlab pipeline group :development, :test, :omnibus do # Using a fork until https://github.com/pivotal/LicenseFinder/pull/816 is -@@ -423,30 +351,6 @@ group :development, :test, :omnibus do +@@ -423,30 +355,6 @@ group :development, :test, :omnibus do gem 'gitlab-license_finder', '~> 6.0', require: false end @@ -147,11 +151,10 @@ gem 'octokit', '~> 4.15' # Updating this gem version here is deprecated. See: -@@ -545,3 +449,7 @@ gem 'ipaddress', '~> 0.8.3' +@@ -545,3 +453,6 @@ gem 'ipaddress', '~> 0.8.3' gem 'parslet', '~> 1.8' gem 'ipynbdiff', '0.4.7' + +gem 'parser' -+gem 'gitlab-dangerfiles' +