Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 20 Nov 2017 10:08:21 +0000 (UTC)
From:      Torsten Zuehlsdorff <tz@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r454536 - in head/www/gitlab: . files
Message-ID:  <201711201008.vAKA8L2t087407@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tz
Date: Mon Nov 20 10:08:21 2017
New Revision: 454536
URL: https://svnweb.freebsd.org/changeset/ports/454536

Log:
  www/gitlab: Adjust recaptcha config
  
  When using most current recaptcha version it was no longer possible to log in
  because of a change in configuration parameter. The patch fixes this issue.
  
  PR:           223738
  Submitted by: otacilio.neto@bsd.com.br
  Reviewed by:  swills

Added:
  head/www/gitlab/files/patch-lib_gitlab_recaptcha.rb   (contents, props changed)
Modified:
  head/www/gitlab/Makefile

Modified: head/www/gitlab/Makefile
==============================================================================
--- head/www/gitlab/Makefile	Mon Nov 20 09:50:18 2017	(r454535)
+++ head/www/gitlab/Makefile	Mon Nov 20 10:08:21 2017	(r454536)
@@ -4,7 +4,7 @@
 PORTNAME=	gitlab
 PORTVERSION=	9.4.7
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www devel
 
 MAINTAINER=	tz@FreeBSD.org

Added: head/www/gitlab/files/patch-lib_gitlab_recaptcha.rb
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/gitlab/files/patch-lib_gitlab_recaptcha.rb	Mon Nov 20 10:08:21 2017	(r454536)
@@ -0,0 +1,13 @@
+--- lib/gitlab/recaptcha.rb.orig	2017-11-18 21:06:32 UTC
++++ lib/gitlab/recaptcha.rb
+@@ -3,8 +3,8 @@ module Gitlab
+     def self.load_configurations!
+       if current_application_settings.recaptcha_enabled
+         ::Recaptcha.configure do |config|
+-          config.public_key  = current_application_settings.recaptcha_site_key
+-          config.private_key = current_application_settings.recaptcha_private_key
++          config.site_key  = current_application_settings.recaptcha_site_key
++          config.secret_key = current_application_settings.recaptcha_private_key
+         end
+ 
+         true



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711201008.vAKA8L2t087407>