Date: Thu, 26 Oct 2017 07:28:07 +0000 (UTC) From: Torsten Zuehlsdorff <tz@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r452906 - branches/2017Q4/www/gitlab/files Message-ID: <201710260728.v9Q7S7fJ019023@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tz Date: Thu Oct 26 07:28:07 2017 New Revision: 452906 URL: https://svnweb.freebsd.org/changeset/ports/452906 Log: www/gitlab: fix broken Gemfile patch I did not resolve the merge conflict correctly which results in pkg fallout. Now fix it by using the original patch file from www/gitlab r452776. Approved by: ports-secteam (swills) Modified: branches/2017Q4/www/gitlab/files/patch-Gemfile Modified: branches/2017Q4/www/gitlab/files/patch-Gemfile ============================================================================== --- branches/2017Q4/www/gitlab/files/patch-Gemfile Thu Oct 26 06:20:53 2017 (r452905) +++ branches/2017Q4/www/gitlab/files/patch-Gemfile Thu Oct 26 07:28:07 2017 (r452906) @@ -41,7 +41,7 @@ +gem 'omniauth-google-oauth2', '>= 0.4.1' gem 'omniauth-oauth2-generic', '~> 0.2.2' gem 'omniauth-saml', '~> 1.7.0' - gem 'omniauth-shibboleth', '~> 1.2.0' +-gem 'omniauth-shibboleth', '~> 1.2.0' -gem 'omniauth-twitter', '~> 1.2.0' +gem 'omniauth-shibboleth', '>= 1.2.0' +gem 'omniauth-twitter', '>= 1.2.0'
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710260728.v9Q7S7fJ019023>