git: 82a00282fd6e - main - www/gitlab-ce: update patch for turn off kerberos

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Sat, 04 Nov 2023 19:11:04 UTC

The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=82a00282fd6e5d7b30f91ac6e54e033ac58c5463

commit 82a00282fd6e5d7b30f91ac6e54e033ac58c5463
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2023-11-04 19:08:16 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2023-11-04 19:08:16 +0000

    www/gitlab-ce: update patch for turn off kerberos
    
    Approved by:    mfechner (maintainer), arrowd (mentor, implicit)
---
 www/gitlab-ce/files/extra-patch-Gemfile-kerberos-off | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/www/gitlab-ce/files/extra-patch-Gemfile-kerberos-off b/www/gitlab-ce/files/extra-patch-Gemfile-kerberos-off
index 267fe8e44ff8..b6cbffee72e0 100644
--- a/www/gitlab-ce/files/extra-patch-Gemfile-kerberos-off
+++ b/www/gitlab-ce/files/extra-patch-Gemfile-kerberos-off
@@ -1,11 +1,11 @@
 --- Gemfile.orig
 +++ Gemfile
-@@ -79,7 +79,7 @@
+@@ -96,7 +96,7 @@
  
  # Kerberos authentication. EE-only
- gem 'gssapi', '~> 1.3.1', group: :kerberos
--gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos
-+#gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos
+ gem 'gssapi', '~> 1.3.1', group: :kerberos # rubocop:todo Gemfile/MissingFeatureCategory
+-gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos # rubocop:todo Gemfile/MissingFeatureCategory
++#gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos # rubocop:todo Gemfile/MissingFeatureCategory
  
  # Spam and anti-bot protection
- gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
+ gem 'recaptcha', '~> 5.12', require: 'recaptcha/rails' # rubocop:todo Gemfile/MissingFeatureCategory