From owner-svn-ports-head@freebsd.org Mon Nov 20 10:08:23 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1C842DE728E; Mon, 20 Nov 2017 10:08:23 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DD019782F6; Mon, 20 Nov 2017 10:08:22 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAKA8L6b087409; Mon, 20 Nov 2017 10:08:21 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAKA8L2t087407; Mon, 20 Nov 2017 10:08:21 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201711201008.vAKA8L2t087407@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Mon, 20 Nov 2017 10:08:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r454536 - in head/www/gitlab: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tz X-SVN-Commit-Paths: in head/www/gitlab: . files X-SVN-Commit-Revision: 454536 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Nov 2017 10:08:23 -0000 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