From owner-svn-ports-all@freebsd.org Fri Dec 27 15:41:43 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7BAD21EF375; Fri, 27 Dec 2019 15:41:43 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47krfH3PfQz4DZw; Fri, 27 Dec 2019 15:41:43 +0000 (UTC) (envelope-from mfechner@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6F42C1AFA6; Fri, 27 Dec 2019 15:41:43 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBRFfhLM068493; Fri, 27 Dec 2019 15:41:43 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBRFfg7J068486; Fri, 27 Dec 2019 15:41:42 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201912271541.xBRFfg7J068486@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Fri, 27 Dec 2019 15:41:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r521005 - in head/www/gitlab-ce: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: in head/www/gitlab-ce: . files X-SVN-Commit-Revision: 521005 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.29 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, 27 Dec 2019 15:41:43 -0000 Author: mfechner Date: Fri Dec 27 15:41:42 2019 New Revision: 521005 URL: https://svnweb.freebsd.org/changeset/ports/521005 Log: Update to 12.6.0. Changelog: https://about.gitlab.com/blog/2019/12/22/gitlab-12-6-released/ Modified: head/www/gitlab-ce/Makefile head/www/gitlab-ce/distinfo head/www/gitlab-ce/files/patch-Gemfile head/www/gitlab-ce/pkg-message head/www/gitlab-ce/pkg-plist Modified: head/www/gitlab-ce/Makefile ============================================================================== --- head/www/gitlab-ce/Makefile Fri Dec 27 15:39:12 2019 (r521004) +++ head/www/gitlab-ce/Makefile Fri Dec 27 15:41:42 2019 (r521005) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab-ce -PORTVERSION= 12.5.5 +PORTVERSION= 12.6.0 PORTREVISION= 0 CATEGORIES= www devel @@ -15,9 +15,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # the rubygems of RUN_DEPENDS matches the order of the Gemfile # which makes maintaining this long list much easier! MY_DEPENDS= git>=2.22.2:devel/git \ - gitlab-shell>=10.2.0:devel/gitlab-shell \ - gitlab-workhorse>=8.14.1:www/gitlab-workhorse \ - gitaly>=1.72.1:devel/gitaly \ + gitlab-shell>=10.3.0:devel/gitlab-shell \ + gitlab-workhorse>=8.18.0:www/gitlab-workhorse \ + gitaly>=1.77.0:devel/gitaly \ gitlab-pages>=1.12.0:www/gitlab-pages \ redis>=3.2.12:databases/redis \ yarn>=1.10.0:www/yarn \ @@ -31,6 +31,7 @@ MY_DEPENDS= git>=2.22.2:devel/git \ rubygem-rugged>=0.28<1.0:devel/rubygem-rugged \ rubygem-grape-path-helpers>=1.1<2.0:devel/rubygem-grape-path-helpers \ rubygem-faraday>=0.12<1.0:www/rubygem-faraday \ + rubygem-marginalia>=1.8.0<1.9:databases/rubygem-marginalia \ rubygem-devise-rails52>=4.6<5.0:devel/rubygem-devise-rails52 \ rubygem-doorkeeper43>=4.3<5.0:security/rubygem-doorkeeper43 \ rubygem-doorkeeper-openid_connect>=1.5<2.0:security/rubygem-doorkeeper-openid_connect \ @@ -78,7 +79,7 @@ MY_DEPENDS= git>=2.22.2:devel/git \ rubygem-graphql-docs>=1.6.0<1.7.0:devel/rubygem-graphql-docs \ rubygem-hashie-forbidden_attributes>0:devel/rubygem-hashie-forbidden_attributes \ rubygem-kaminari-rails52>=1.0<2.0:www/rubygem-kaminari-rails52 \ - rubygem-hamlit>=2.8.8<2.9.0:www/rubygem-hamlit \ + rubygem-hamlit>=2.11.0<2.12.0:www/rubygem-hamlit \ rubygem-carrierwave>=1.3<2.0:www/rubygem-carrierwave \ rubygem-mini_magick>0:graphics/rubygem-mini_magick \ rubygem-fog-aws>=3.5<4.0:net/rubygem-fog-aws \ @@ -96,11 +97,11 @@ MY_DEPENDS= git>=2.22.2:devel/git \ rubygem-elasticsearch-api503=5.0.3:textproc/rubygem-elasticsearch-api503 \ rubygem-aws-sdk>0:devel/rubygem-aws-sdk \ rubygem-faraday_middleware-aws-signers-v4>0:devel/rubygem-faraday_middleware-aws-signers-v4 \ - rubygem-html-pipeline>=2.8:textproc/rubygem-html-pipeline \ + rubygem-html-pipeline>=2.12<3.0:textproc/rubygem-html-pipeline \ rubygem-deckar01-task_list>=2.2.1<2.3.0:www/rubygem-deckar01-task_list \ rubygem-gitlab-markup>=1.7.0<1.8.0:textproc/rubygem-gitlab-markup \ rubygem-github-markup17>=1.7.0<1.8.0:textproc/rubygem-github-markup17 \ - rubygem-commonmarker>=0.17<1.0:textproc/rubygem-commonmarker \ + rubygem-commonmarker>=0.20<1.0:textproc/rubygem-commonmarker \ rubygem-redcloth>=4.3.2<4.4.0:www/rubygem-redcloth \ rubygem-rdoc>=6.0<7.0:devel/rubygem-rdoc \ rubygem-org-ruby>=0.9.12<0.10.0:textproc/rubygem-org-ruby \ @@ -120,8 +121,8 @@ MY_DEPENDS= git>=2.22.2:devel/git \ rubygem-rack>=2.0.7<2.1.0,3:www/rubygem-rack \ rubygem-unicorn>=5.4.1<5.5.0:www/rubygem-unicorn \ rubygem-unicorn-worker-killer>=0.4.4<0.5.0:www/rubygem-unicorn-worker-killer \ - rubygem-puma>=3.12<4.0:www/rubygem-puma \ - rubygem-puma_worker_killer>=0:www/rubygem-puma_worker_killer \ + rubygem-gitlab-puma>=4.3.1.g.2:www/rubygem-gitlab-puma \ + rubygem-gitlab-puma_worker_killer>=0.1.1.g.1:www/rubygem-gitlab-puma_worker_killer \ rubygem-rack-timeout>=0:www/rubygem-rack-timeout \ rubygem-state_machines-activerecord>=0.6.0<0.7.0:databases/rubygem-state_machines-activerecord \ rubygem-acts-as-taggable-on>=6.0<7.0:www/rubygem-acts-as-taggable-on \ @@ -159,8 +160,8 @@ MY_DEPENDS= git>=2.22.2:devel/git \ rubygem-charlock_holmes>=0.7.5<0.8.0:textproc/rubygem-charlock_holmes \ rubygem-mimemagic>=0.3.2<0.4.0:misc/rubygem-mimemagic \ rubygem-fast_blank>=0:devel/rubygem-fast_blank \ - rubygem-chronic>=0.10.2<0.11.0:devel/rubygem-chronic \ - rubygem-gitlab_chronic_duration>=0.10.6.1<0.10.7:devel/rubygem-gitlab_chronic_duration \ + rubygem-gitlab-chronic>=0.10.5<0.11.0:devel/rubygem-gitlab-chronic \ + rubygem-gitlab_chronic_duration>=0.10.6.2<0.10.7:devel/rubygem-gitlab_chronic_duration \ rubygem-webpack-rails-rails52>=0.9.10<0.10.0:www/rubygem-webpack-rails-rails52 \ rubygem-rack-proxy>=0.6.0<0.7.0:www/rubygem-rack-proxy \ rubygem-sassc-rails-rails52>=2.1.0<2.2.0:textproc/rubygem-sassc-rails-rails52 \ @@ -182,7 +183,7 @@ MY_DEPENDS= git>=2.22.2:devel/git \ rubygem-gettext_i18n_rails_js-rails52>=1.3<2.0:devel/rubygem-gettext_i18n_rails_js-rails52 \ rubygem-gettext>=3.2.2<3.3.0:devel/rubygem-gettext \ rubygem-batch-loader>=1.4.0<1.5.0:devel/rubygem-batch-loader \ - rubygem-gitlab-peek-rails52>=0.0.1<0.1.0:devel/rubygem-gitlab-peek-rails52 \ + rubygem-peek-rails52>=1.1.0<2.0:devel/rubygem-peek-rails52 \ rubygem-snowplow-tracker>=0.6.1<0.7.0:devel/rubygem-snowplow-tracker \ rubygem-derailed_benchmarks>0:benchmarks/rubygem-derailed_benchmarks \ rubygem-method_source>=0.8<1.0:devel/rubygem-method_source \ @@ -190,7 +191,7 @@ MY_DEPENDS= git>=2.22.2:devel/git \ rubygem-prometheus-client-mmap>=0.9.10<0.10.0:devel/rubygem-prometheus-client-mmap \ rubygem-raindrops>=0.18<1.0:www/rubygem-raindrops \ rubygem-octokit>=4.9<5.0:net/rubygem-octokit \ - rubygem-mail_room>=0.9.1<0.10.0:mail/rubygem-mail_room \ + rubygem-mail_room>=0.10.0<0.11.0:mail/rubygem-mail_room \ rubygem-email_reply_trimmer>=0.1<1.0:mail/rubygem-email_reply_trimmer \ rubygem-html2text>=0:textproc/rubygem-html2text \ rubygem-ruby-prof>=1.0.0<1.1.0:devel/rubygem-ruby-prof \ @@ -207,7 +208,7 @@ MY_DEPENDS= git>=2.22.2:devel/git \ rubygem-sshkey>=2.0<3.0:security/rubygem-sshkey \ rubygem-ed25519>=1.2<2.0:security/rubygem-ed25519 \ rubygem-bcrypt_pbkdf>=1.0<2.0:security/rubygem-bcrypt_pbkdf \ - rubygem-gitaly>=1.70.0<1.71:net/rubygem-gitaly \ + rubygem-gitaly>=1.73.0<1.74:net/rubygem-gitaly \ rubygem-grpc>=1.24.0<1.25.0:net/rubygem-grpc \ rubygem-google-protobuf38>=3.8.0<3.9.0:devel/rubygem-google-protobuf38 \ rubygem-toml-rb10>=1.0.0<1.1.0:www/rubygem-toml-rb10 \ @@ -239,7 +240,7 @@ USE_GITLAB= yes GL_ACCOUNT= gitlab-org GL_PROJECT= gitlab-foss # Find the here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags -GL_COMMIT= 64b66e0cb6d1bfd27abf24e06653f00bddb60597 +GL_COMMIT= fc376e40baf83550d228e2cbfd4be00d3825b8c0 USERS= git GROUPS= git Modified: head/www/gitlab-ce/distinfo ============================================================================== --- head/www/gitlab-ce/distinfo Fri Dec 27 15:39:12 2019 (r521004) +++ head/www/gitlab-ce/distinfo Fri Dec 27 15:41:42 2019 (r521005) @@ -1,3 +1,3 @@ -TIMESTAMP = 1576765691 -SHA256 (gitlab-org-gitlab-foss-64b66e0cb6d1bfd27abf24e06653f00bddb60597_GL0.tar.gz) = 78dca4abbec30b0d5a7078a6aeefece6d84df8e140099c5222843527a2aebd65 -SIZE (gitlab-org-gitlab-foss-64b66e0cb6d1bfd27abf24e06653f00bddb60597_GL0.tar.gz) = 102134980 +TIMESTAMP = 1576924309 +SHA256 (gitlab-org-gitlab-foss-fc376e40baf83550d228e2cbfd4be00d3825b8c0_GL0.tar.gz) = 28fe8ebaa4e9ebb16697655f1149182659c2a2573178f29632515753d4bd9233 +SIZE (gitlab-org-gitlab-foss-fc376e40baf83550d228e2cbfd4be00d3825b8c0_GL0.tar.gz) = 99797665 Modified: head/www/gitlab-ce/files/patch-Gemfile ============================================================================== --- head/www/gitlab-ce/files/patch-Gemfile Fri Dec 27 15:39:12 2019 (r521004) +++ head/www/gitlab-ce/files/patch-Gemfile Fri Dec 27 15:41:42 2019 (r521005) @@ -1,4 +1,4 @@ ---- Gemfile.orig 2019-12-03 11:22:02 UTC +--- Gemfile.orig 2019-12-20 19:09:32 UTC +++ Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' @@ -8,7 +8,7 @@ gem 'bootsnap', '~> 1.4' -@@ -92,7 +92,6 @@ gem 'graphql', '~> 1.9.11' +@@ -93,7 +93,6 @@ gem 'graphql', '~> 1.9.11' # https://gitlab.com/gitlab-org/gitlab/issues/31747 gem 'graphiql-rails', '~> 1.4.10' gem 'apollo_upload_server', '~> 2.0.0.beta3' @@ -16,7 +16,7 @@ # Disable strong_params so that Mash does not respond to :permitted? gem 'hashie-forbidden_attributes' -@@ -148,7 +147,7 @@ gem 'wikicloth', '0.8.1' +@@ -149,7 +148,7 @@ gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 2.0.10' gem 'asciidoctor-include-ext', '~> 0.3.1', require: false gem 'asciidoctor-plantuml', '0.0.9' @@ -25,7 +25,7 @@ gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' gem 'nokogiri', '~> 1.10.5' -@@ -226,7 +225,7 @@ gem 'redis-rails', '~> 5.0.2' +@@ -227,7 +226,7 @@ gem 'redis-rails', '~> 5.0.2' gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false # HipChat integration @@ -34,7 +34,7 @@ # Jira integration gem 'jira-ruby', '~> 1.7' -@@ -329,89 +328,6 @@ group :metrics do +@@ -329,90 +328,6 @@ group :metrics do # Prometheus gem 'prometheus-client-mmap', '~> 0.9.10' gem 'raindrops', '~> 0.18' @@ -56,20 +56,15 @@ -end - -group :development, :test do -- gem 'bullet', '~> 5.5.0', require: !!ENV['ENABLE_BULLET'] +- gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET'] - gem 'pry-byebug', '~> 3.5.1', platform: :mri - gem 'pry-rails', '~> 0.3.4' - - gem 'awesome_print', require: false -- gem 'fuubar', '~> 2.2.0' - - gem 'database_cleaner', '~> 1.7.0' - gem 'factory_bot_rails', '~> 5.1.0' -- gem 'rspec-rails', '~> 3.8.0' -- gem 'rspec-retry', '~> 0.6.1' -- gem 'rspec_profiling', '~> 0.0.5' -- gem 'rspec-set', '~> 0.1.3' -- gem 'rspec-parameterized', require: false +- gem 'rspec-rails', '~> 4.0.0.beta3' - - # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) - gem 'minitest', '~> 5.11.0' @@ -77,10 +72,6 @@ - # Generate Fake data - gem 'ffaker', '~> 2.10' - -- gem 'capybara', '~> 3.22.0' -- gem 'capybara-screenshot', '~> 1.0.22' -- gem 'selenium-webdriver', '~> 3.141' -- - gem 'spring', '~> 2.0.0' - gem 'spring-commands-rspec', '~> 1.0.4' - @@ -91,7 +82,7 @@ - gem 'rubocop-rspec', '~> 1.22.1' - - gem 'scss_lint', '~> 0.56.0', require: false -- gem 'haml_lint', '~> 0.31.0', require: false +- gem 'haml_lint', '~> 0.34.0', require: false - gem 'simplecov', '~> 0.16.1', require: false - gem 'bundler-audit', '~> 0.5.0', require: false - @@ -99,7 +90,7 @@ - - gem 'knapsack', '~> 1.17' - -- gem 'stackprof', '~> 0.2.10', require: false +- gem 'stackprof', '~> 0.2.13', require: false - - gem 'simple_po_parser', '~> 1.1.2', require: false - @@ -112,6 +103,16 @@ -end - -group :test do +- gem 'fuubar', '~> 2.2.0' +- gem 'rspec-retry', '~> 0.6.1' +- gem 'rspec_profiling', '~> 0.0.5' +- gem 'rspec-set', '~> 0.1.3' +- gem 'rspec-parameterized', require: false +- +- gem 'capybara', '~> 3.22.0' +- gem 'capybara-screenshot', '~> 1.0.22' +- gem 'selenium-webdriver', '~> 3.142' +- - gem 'shoulda-matchers', '~> 4.0.1', require: false - gem 'email_spec', '~> 2.2.0' - gem 'json-schema', '~> 2.8.0' Modified: head/www/gitlab-ce/pkg-message ============================================================================== --- head/www/gitlab-ce/pkg-message Fri Dec 27 15:39:12 2019 (r521004) +++ head/www/gitlab-ce/pkg-message Fri Dec 27 15:41:42 2019 (r521005) @@ -18,9 +18,9 @@ EOM { message: <