From owner-svn-ports-all@freebsd.org Fri Jan 5 14:03:20 2018 Return-Path: Delivered-To: svn-ports-all@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 4C5EBEAB022; Fri, 5 Jan 2018 14:03:20 +0000 (UTC) (envelope-from swills@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 23CCF6A646; Fri, 5 Jan 2018 14:03:20 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w05E3Je1007271; Fri, 5 Jan 2018 14:03:19 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w05E3JnM007269; Fri, 5 Jan 2018 14:03:19 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201801051403.w05E3JnM007269@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Fri, 5 Jan 2018 14:03:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458142 - in head/www/gitlab: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/www/gitlab: . files X-SVN-Commit-Revision: 458142 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jan 2018 14:03:20 -0000 Author: swills Date: Fri Jan 5 14:03:18 2018 New Revision: 458142 URL: https://svnweb.freebsd.org/changeset/ports/458142 Log: www/gitlab: fix Gemfile for updated dependencies PR: 224932 Submitted by: Matthias Fechner (maintainer) Modified: head/www/gitlab/Makefile (contents, props changed) head/www/gitlab/files/patch-Gemfile (contents, props changed) Modified: head/www/gitlab/Makefile ============================================================================== --- head/www/gitlab/Makefile Fri Jan 5 13:32:48 2018 (r458141) +++ head/www/gitlab/Makefile Fri Jan 5 14:03:18 2018 (r458142) @@ -4,7 +4,7 @@ PORTNAME= gitlab PORTVERSION= 10.1.5 DISTVERSIONPREFIX= v -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www devel MAINTAINER= idefix@fechner.net @@ -185,7 +185,7 @@ RUN_DEPENDS= git>=2.14.1:devel/git \ rubygem-vmstat>=2.3.0:sysutils/rubygem-vmstat \ rubygem-sys-filesystem>=1.1.6:sysutils/rubygem-sys-filesystem \ rubygem-net-ssh>=4.1.0:security/rubygem-net-ssh \ - rubygem-rbnacl>=4.0:security/rubygem-rbnacl \ + rubygem-rbnacl4<=4.0.2:security/rubygem-rbnacl4 \ rubygem-rbnacl-libsodium>=0:security/rubygem-rbnacl-libsodium \ rubygem-bcrypt_pbkdf>=1.0:security/rubygem-bcrypt_pbkdf \ rubygem-gitaly-proto>=0.39.0:net/rubygem-gitaly-proto \ Modified: head/www/gitlab/files/patch-Gemfile ============================================================================== --- head/www/gitlab/files/patch-Gemfile Fri Jan 5 13:32:48 2018 (r458141) +++ head/www/gitlab/files/patch-Gemfile Fri Jan 5 14:03:18 2018 (r458142) @@ -163,7 +163,7 @@ # GitLab settings gem 'settingslogic', '~> 2.0.9' -@@ -168,7 +168,7 @@ gem 're2', '~> 1.1.1' +@@ -168,20 +168,20 @@ gem 're2', '~> 1.1.1' # Misc @@ -172,7 +172,10 @@ # Cache gem 'redis-rails', '~> 5.0.1' -@@ -178,10 +178,10 @@ gem 'redis', '~> 3.2' + + # Redis +-gem 'redis', '~> 3.2' ++gem 'redis', '>= 3.2' gem 'connection_pool', '~> 2.0' # HipChat integration @@ -214,7 +217,7 @@ # Ace editor gem 'ace-rails-ap', '~> 4.1.0' -@@ -234,25 +234,25 @@ gem 'chronic', '~> 0.10.2' +@@ -234,173 +234,89 @@ gem 'chronic', '~> 0.10.2' gem 'chronic_duration', '~> 0.10.6' gem 'webpack-rails', '~> 0.9.10' @@ -245,9 +248,10 @@ -gem 'sentry-raven', '~> 2.5.3' +gem 'sentry-raven', '>= 2.5.3' - gem 'premailer-rails', '~> 1.9.7' +-gem 'premailer-rails', '~> 1.9.7' ++gem 'premailer-rails', '>= 1.9.7' -@@ -260,135 +260,51 @@ gem 'premailer-rails', '~> 1.9.7' + # I18n gem 'ruby_parser', '~> 3.8', require: false gem 'rails-i18n', '~> 4.0.9' gem 'gettext_i18n_rails', '~> 1.8.0' @@ -369,7 +373,8 @@ +gem 'email_reply_trimmer', '>= 0.1' gem 'html2text' - gem 'ruby-prof', '~> 0.16.2' +-gem 'ruby-prof', '~> 0.16.2' ++gem 'ruby-prof', '>= 0.16.2' # OAuth -gem 'oauth2', '~> 1.4' @@ -393,7 +398,10 @@ # Required for ED25519 SSH host key support group :ed25519 do -@@ -398,9 +314,9 @@ group :ed25519 do + gem 'rbnacl-libsodium' +- gem 'rbnacl', '~> 4.0' ++ gem 'rbnacl', '~> 4.0.2' + gem 'bcrypt_pbkdf', '~> 1.0' end # Gitaly GRPC client