git: 35d750f806d4 - main - www/gitlab-ce: fixed broken patch file

From: Matthias Fechner <mfechner_at_FreeBSD.org>
Date: Fri, 27 May 2022 19:17:54 UTC
The branch main has been updated by mfechner:

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

commit 35d750f806d4539ed73ccc03bc3d2e4cc14e9afa
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2022-05-27 19:17:26 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
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'
 +