From nobody Fri Jun 24 10:21:04 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E48FB87AC0E; Fri, 24 Jun 2022 10:21:05 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LTtSK2DjQz3lT0; Fri, 24 Jun 2022 10:21:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656066065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dc6HgyVXyvFJAvISt7n+eWTVr67ti6kQwmSw5CtWOwM=; b=SC89nLg/LDrBdS/yo7yRw/TWKgSOZh64cSMeTk0mVt3bgm+Asx+bBbdwM5Szqy9MqX5rYN 32f8628GGr92XJ3huuzGkqta3GEEqGSuqYGT108LimWlbGG5qUOA5J9L3S5+6/K66tOUlw p/v8NVNEqyeLdEz/k/VkZqsWtzwbN3KgxJfApy/hlQ7DQtTUX0/uD/IacJrV3C/nnkIsyv gU67I7uR+vmDLpRd/t9lkotvZpGmvwb9Imi7++AP3N8y3LDKa2aTLytnhEYnTNecVjie4g D+QiqdasgeLdOwjD0e/fMtLJwCJgsvgkbrX8Fb77ieWI4BjpzAYFbo0R2ckwZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DB6C85CF3; Fri, 24 Jun 2022 10:21:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25OAL4Xw031831; Fri, 24 Jun 2022 10:21:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25OAL4X7031830; Fri, 24 Jun 2022 10:21:04 GMT (envelope-from git) Date: Fri, 24 Jun 2022 10:21:04 GMT Message-Id: <202206241021.25OAL4X7031830@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: aa5b3808af6d - main - www/gitlab-ce: Major update to 15.1.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aa5b3808af6d02ec44c3d6604c12945156cda8d8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656066065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dc6HgyVXyvFJAvISt7n+eWTVr67ti6kQwmSw5CtWOwM=; b=HFT2hDr0rkqhug+mHvzGhlYbDGc6Vcf5JXUedsy4lZ/ru500yDME7txxGJjTkgmF27iYPm tvnDqr+bmjJpCuXkq7lKRjHIBGzdQ9HWfo9dp7RY2gICKdRPlMCueZIE6xr/c78Q7f/zeS GZ6XXmtVAGikiYGOa8tqHZqYsARexbhCBTUeVfOmkTV/aIyJwlNturLW2fQ3yVODcOiGre QXkFVjqGvzSVZOdXPowRO6OB103rjzyZleSaP3V1CtMjXeCwxr8CrnhsSP8Zg024fqw6Ug o3/aSXZ1q4hfgzJ1Xei6C0055Xza6tQaFhZv3LVPk5LlSe3Wj2xBgYUiWSv1+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656066065; a=rsa-sha256; cv=none; b=QbE29KdPXu5+V3FymjsITKxc9aDiiVj7/vwx0elw7ZNKeHWTAyMKc1Txox3wRwxmZlVlCl CwmICSzgU7u3sma0oylzQ9zl+gZ2N1uxqaca9qVke45bquMregS7B2a6Qa0MX+dbEqQfky Dv3slo5mxzqBOHZDCdxk5Qpmdggwhu2JOjXGem76IdKyKyR6KK/VoDHi2Cwh1GoyEWPYJ8 RMu9uUHDMmq8+Z7Ez/jkAxVuVoT8vOwDHwXyhXEChgWwh7ckOqnXmblPDo7H8c5XZ+la6S aOEx6Wc4Fm3Ao8ElpHUQlzTJpoicu8U2azjTE55KvW7ppmaXL+L6n6ayKHAxNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=aa5b3808af6d02ec44c3d6604c12945156cda8d8 commit aa5b3808af6d02ec44c3d6604c12945156cda8d8 Author: Matthias Fechner AuthorDate: 2022-06-24 10:18:50 +0000 Commit: Matthias Fechner CommitDate: 2022-06-24 10:20:07 +0000 www/gitlab-ce: Major update to 15.1.0 Changelog: https://about.gitlab.com/releases/2022/06/22/gitlab-15-1-released/ --- www/gitlab-ce/Makefile | 59 ++++++++++++++++++++------------------- www/gitlab-ce/distinfo | 6 ++-- www/gitlab-ce/files/patch-Gemfile | 25 +++++++++-------- www/gitlab-ce/pkg-message | 4 +-- www/gitlab-workhorse/Makefile | 4 +-- www/gitlab-workhorse/distinfo | 10 +++---- 6 files changed, 56 insertions(+), 52 deletions(-) diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 898f4d5ee7e3..c97661973c57 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,8 +1,8 @@ # Created by: Torsten Zuehlsdorff PORTNAME= gitlab-ce -PORTVERSION= 15.0.3 -PORTREVISION= 1 +PORTVERSION= 15.1.0 +PORTREVISION= 0 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -18,22 +18,22 @@ LICENSE_FILE= ${WRKSRC}/LICENSE MY_DEPENDS= git>=2.32.0:devel/git \ gitaly>=${PORTVERSION}:devel/gitaly \ gitlab-elasticsearch-indexer>=3.0.0:textproc/gitlab-elasticsearch-indexer \ - gitlab-agent>=15.0.0:net/gitlab-agent \ + gitlab-agent>=15.1.0:net/gitlab-agent \ gitlab-metrics-exporter>0:devel/gitlab-metrics-exporter \ - gitlab-pages>=1.58.0:www/gitlab-pages \ - gitlab-shell>=14.3.0:devel/gitlab-shell \ + gitlab-pages>=1.59.0:www/gitlab-pages \ + gitlab-shell>=14.7.4:devel/gitlab-shell \ gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \ redis>=6.0.14:databases/redis \ yarn>=1.10.0:www/yarn \ gtar>0:archivers/gtar \ bash>0:shells/bash \ rubygem-rails61>=6.1.6.0<6.1.7:www/rubygem-rails61 \ - rubygem-bootsnap111>=1.9.4<1.12:devel/rubygem-bootsnap111 \ + rubygem-bootsnap>=1.12.0<1.13:devel/rubygem-bootsnap \ rubygem-responders-rails61>=3.0<4.0:www/rubygem-responders-rails61 \ rubygem-sprockets3>=3.7<3.8:devel/rubygem-sprockets3 \ rubygem-view_component-rails61>=2.50.0<2.51:devel/rubygem-view_component-rails61 \ rubygem-default_value_for>=3.4.0<3.5.0:devel/rubygem-default_value_for \ - rubygem-pg>=1.2.3<2:databases/rubygem-pg \ + rubygem-pg13>=1.3.5<1.4:databases/rubygem-pg13 \ rubygem-rugged>=1.2<2:devel/rubygem-rugged \ rubygem-grape-path-helpers>=1.7.0<1.8:devel/rubygem-grape-path-helpers \ rubygem-faraday1>=1.10.0<2:www/rubygem-faraday1 \ @@ -50,7 +50,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-omniauth-azure-activedirectory-v2>=1.0<2:net/rubygem-omniauth-azure-activedirectory-v2 \ rubygem-omniauth-azure-oauth2>=0.0.9<0.1.0:net/rubygem-omniauth-azure-oauth2 \ rubygem-omniauth-cas3>=1.1.4<1.2.0:security/rubygem-omniauth-cas3 \ - rubygem-omniauth-dingtalk-oauth2>=1.0<2:security/rubygem-omniauth-dingtalk-oauth2 \ + rubygem-omniauth-dingtalk-oauth2>=1.0.1<2:security/rubygem-omniauth-dingtalk-oauth2 \ rubygem-omniauth-alicloud>=1.0.1<1.1:security/rubygem-omniauth-alicloud \ rubygem-omniauth-facebook4>=4.0.0<4.1.0:net/rubygem-omniauth-facebook4 \ rubygem-omniauth-github>=1.4.0<2.0:net/rubygem-omniauth-github \ @@ -66,7 +66,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-omniauth-ultraauth>=0.0.2<0.1.0:net/rubygem-omniauth-ultraauth \ rubygem-omniauth-salesforce>=1.0.5<1.1.0:net/rubygem-omniauth-salesforce \ rubygem-omniauth-atlassian-oauth2>=0.2.0<0.3:security/rubygem-omniauth-atlassian-oauth2 \ - rubygem-rack-oauth2>=1.16.0<1.17.0:security/rubygem-rack-oauth2 \ + rubygem-rack-oauth2>=1.19.0<1.20.0:security/rubygem-rack-oauth2 \ rubygem-jwt21>=2.1.0<2.2.0:www/rubygem-jwt21 \ rubygem-gssapi>0:security/rubygem-gssapi \ rubygem-recaptcha>=4.11<5.0:devel/rubygem-recaptcha \ @@ -86,8 +86,8 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-net-ldap>0.16.3:net/rubygem-net-ldap \ rubygem-grape15>=1.5.2<1.6:devel/rubygem-grape15 \ rubygem-grape-entity>=0.10.0<0.11.0,1:devel/rubygem-grape-entity \ - rubygem-rack-cors>=1.0.6<1.1.0:www/rubygem-rack-cors \ - rubygem-graphql>=1.11.10<1.12:devel/rubygem-graphql \ + rubygem-rack-cors>=1.1.1<1.2.0:www/rubygem-rack-cors \ + rubygem-graphql>=1.13.12<1.14:devel/rubygem-graphql \ rubygem-graphiql-rails>=1.8<2:devel/rubygem-graphiql-rails \ rubygem-apollo_upload_server>=2.1.0<2.2:net/rubygem-apollo_upload_server \ rubygem-graphql-docs>=1.6.0<1.7.0:devel/rubygem-graphql-docs \ @@ -98,14 +98,14 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-hamlit>=2.15.0<2.16:www/rubygem-hamlit \ rubygem-carrierwave>=1.3.2<2.0:www/rubygem-carrierwave \ rubygem-mini_magick410>=4.10.1<4.11:graphics/rubygem-mini_magick410 \ - rubygem-fog-aws>=3.12<4:net/rubygem-fog-aws \ + rubygem-fog-aws>=3.14<4:net/rubygem-fog-aws \ rubygem-fog-core210>=2.1.0<2.1.1:devel/rubygem-fog-core210 \ rubygem-fog-google>=1.15<2:net/rubygem-fog-google \ rubygem-fog-local>=0.6<1.0:net/rubygem-fog-local \ rubygem-fog-openstack>=1.0<2.0:net/rubygem-fog-openstack \ rubygem-fog-rackspace>=0.1.1<1.2.0:net/rubygem-fog-rackspace \ rubygem-fog-aliyun>=0.3<1.0:net/rubygem-fog-aliyun \ - rubygem-gitlab-fog-azure-rm>=1.2.0<1.3:net/rubygem-gitlab-fog-azure-rm \ + rubygem-gitlab-fog-azure-rm>=1.3.0<1.4:net/rubygem-gitlab-fog-azure-rm \ rubygem-google-api-client>=0.33<1:devel/rubygem-google-api-client \ rubygem-unf>=0.1.4<0.2.0:textproc/rubygem-unf \ rubygem-seed-fu>=2.3.7<2.4.0:databases/rubygem-seed-fu \ @@ -132,16 +132,16 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-asciidoctor-include-ext>=0.4.0<0.5.0:textproc/rubygem-asciidoctor-include-ext \ rubygem-asciidoctor-plantuml00>=0.0.12<0.1:textproc/rubygem-asciidoctor-plantuml00 \ rubygem-asciidoctor-kroki>=0.5.0<0.6:textproc/rubygem-asciidoctor-kroki \ - rubygem-rouge327>=3.27.0<3.28:textproc/rubygem-rouge327 \ + rubygem-rouge>=3.29.0<3.30:textproc/rubygem-rouge \ rubygem-truncato>=0.7.11<0.8.0:textproc/rubygem-truncato \ rubygem-bootstrap_form>=4.2.0<4.3.0:devel/rubygem-bootstrap_form \ - rubygem-nokogiri>=1.13.3<2:textproc/rubygem-nokogiri \ + rubygem-nokogiri>=1.13.6<1.14:textproc/rubygem-nokogiri \ rubygem-escape_utils>=1.1<2.0:textproc/rubygem-escape_utils \ rubygem-icalendar>=0:devel/rubygem-icalendar \ rubygem-diffy>=3.3<4:textproc/rubygem-diffy \ rubygem-diff_match_patch>=0.1.0<0.2.0:textproc/rubygem-diff_match_patch \ - rubygem-rack>=2.2.3<2.3,3:www/rubygem-rack \ - rubygem-rack-timeout>=0.5.1<0.6:www/rubygem-rack-timeout \ + rubygem-rack>=2.2.3.0<2.2.4,3:www/rubygem-rack \ + rubygem-rack-timeout>=0.6.0<0.7:www/rubygem-rack-timeout \ rubygem-puma>=5.6.2<5.7:www/rubygem-puma \ rubygem-puma_worker_killer>=0.3.1:www/rubygem-puma_worker_killer \ rubygem-sd_notify>=0.1.0<0.2:devel/rubygem-sd_notify \ @@ -153,10 +153,10 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-gitlab-sidekiq-fetcher>=0.8.0<0.9:devel/rubygem-gitlab-sidekiq-fetcher \ rubygem-fugit12>=1.2.1<1.3.0:devel/rubygem-fugit12 \ rubygem-httparty>=0.16.4<1:www/rubygem-httparty \ - rubygem-rainbow>=3.0<4.0:devel/rubygem-rainbow \ + rubygem-rainbow>=3.1.1<4.0:devel/rubygem-rainbow \ rubygem-ruby-progressbar>=1.11<2:devel/rubygem-ruby-progressbar \ rubygem-settingslogic>=2.0.9<2.1.0:devel/rubygem-settingslogic \ - rubygem-re2>=1.2.0<1.3.0:devel/rubygem-re2 \ + rubygem-re2>=1.4.0<1.5.0:devel/rubygem-re2 \ rubygem-version_sorter>=2.2.4<2.3.0:textproc/rubygem-version_sorter \ rubygem-js_regex>=3.7<4.0:textproc/rubygem-js_regex \ rubygem-device_detector>=0:devel/rubygem-device_detector \ @@ -191,14 +191,14 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-request_store>=1.5.1<2.0:devel/rubygem-request_store \ rubygem-base32>=0.3.0<0.4.0:converters/rubygem-base32 \ rubygem-gitlab-license>=2.1.0<2.2:devel/rubygem-gitlab-license \ - rubygem-rack-attack>=6.3.0<6.4.0:www/rubygem-rack-attack \ + rubygem-rack-attack>=6.6.0<6.7:www/rubygem-rack-attack \ rubygem-sentry-raven>=3.1<4.0:devel/rubygem-sentry-raven \ rubygem-sentry-ruby>=5.1.1<5.2:devel/rubygem-sentry-ruby \ rubygem-sentry-rails>=5.1.1<5.2:devel/rubygem-sentry-rails \ rubygem-sentry-sidekiq>=5.1.1<5.2:devel/rubygem-sentry-sidekiq \ - rubygem-pg_query>=2.1<3:databases/rubygem-pg_query \ - rubygem-premailer-rails-rails61>=1.10.3<1.11.0:mail/rubygem-premailer-rails-rails61 \ - rubygem-gitlab-labkit>=0.22.0<0.23:devel/rubygem-gitlab-labkit \ + rubygem-pg_query>=2.1.3<2.2:databases/rubygem-pg_query \ + rubygem-premailer-rails-rails61>=1.10.3<1.11:mail/rubygem-premailer-rails-rails61 \ + rubygem-gitlab-labkit>=0.23.0<0.24:devel/rubygem-gitlab-labkit \ rubygem-thrift>=0.14.0:devel/rubygem-thrift \ rubygem-ruby_parser>=3.15<4.0:devel/rubygem-ruby_parser \ rubygem-rails-i18n-rails61>=6.0<7.0:devel/rubygem-rails-i18n-rails61 \ @@ -213,7 +213,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-prometheus-client-mmap>=0.15.0<0.16.0:devel/rubygem-prometheus-client-mmap \ rubygem-warning>=1.2.0<1.3:devel/rubygem-warning \ rubygem-gitlab-license_finder>=6.14.2.1<7:devel/rubygem-gitlab-license_finder \ - rubygem-gitlab-dangerfiles>=3.0<4:devel/rubygem-gitlab-dangerfiles \ + rubygem-gitlab-dangerfiles>=3.4.0<3.5:devel/rubygem-gitlab-dangerfiles \ rubygem-octokit>=4.20<5.0:net/rubygem-octokit \ rubygem-gitlab-mail_room>=0.0.9<0.1.0:mail/rubygem-gitlab-mail_room \ rubygem-email_reply_trimmer>=0.1<1.0:mail/rubygem-email_reply_trimmer \ @@ -229,9 +229,9 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-vmstat>=2.3.0<2.4.0:sysutils/rubygem-vmstat \ rubygem-sys-filesystem>=1.4.3<1.5:sysutils/rubygem-sys-filesystem \ rubygem-net-ntp>0:net/rubygem-net-ntp \ - rubygem-ssh_data>=1.2<2:security/rubygem-ssh_data \ + rubygem-ssh_data>=1.3<2:security/rubygem-ssh_data \ rubygem-spamcheck>=0.1.0<0.2:net/rubygem-spamcheck \ - rubygem-gitaly>=14.10.0.pre.rc1<14.11.0:net/rubygem-gitaly \ + rubygem-gitaly>=15.1.0.pre.rc1<15.2.0:net/rubygem-gitaly \ rubygem-kas-grpc>=0.0.2,1<0.0.3,1:net/rubygem-kas-grpc \ rubygem-grpc142>=1.42.0<1.43:net/rubygem-grpc142 \ rubygem-google-protobuf319>=3.19.4<3.20:devel/rubygem-google-protobuf319 \ @@ -242,7 +242,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-unleash>=3.2.2<3.3:devel/rubygem-unleash \ rubygem-gitlab-experiment>=0.7.0<0.8:devel/rubygem-gitlab-experiment \ rubygem-lograge-rails61>=0.11.2<1.0:www/rubygem-lograge-rails61 \ - rubygem-grape_logging>=1.7<2.0:devel/rubygem-grape_logging \ + rubygem-grape_logging>=1.8<2.0:devel/rubygem-grape_logging \ rubygem-gitlab-net-dns>=0.9.1<0.10:dns/rubygem-gitlab-net-dns \ rubygem-countries>=3.0.0<4.0.0:devel/rubygem-countries \ rubygem-retriable>=3.1.2<3.2.0:devel/rubygem-retriable \ @@ -260,6 +260,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-ipaddress>=0.8.3<0.9:net/rubygem-ipaddress \ rubygem-parslet1>=1.8<2:textproc/rubygem-parslet1 \ rubygem-ipynbdiff>=0.4.7<0.4.8:devel/rubygem-ipynbdiff \ + rubygem-ed25519>=1.3.0<1.4:security/rubygem-ed25519 \ rubygem-parser>=0:devel/rubygem-parser BUILD_DEPENDS= gem:devel/ruby-gems \ @@ -281,7 +282,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= 418555ba81982c6ee683a39dbdec134d69bebb3f +GL_COMMIT= 6bea43795252f980eeee7ce67413ef440da88a31 USERS= git GROUPS= git @@ -350,6 +351,7 @@ post-install: @${ECHO_CMD} "@dir(git,git) ${WWWDIR_REL}/" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/images/auth_buttons/" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/javascripts/locale/" >> ${TMPPLIST} + @${ECHO_CMD} "@dir ${WWWDIR_REL}/app/assets/javascripts/pipeline_wizard/templates/" >> ${TMPPLIST} @${ECHO_CMD} "@dir(git,git,554) ${WWWDIR_REL}/bin" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/config" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/builds" >> ${TMPPLIST} @@ -386,6 +388,7 @@ post-install: @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/8_monitor" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/browser_ui/5_package" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/browser_ui/8_monitor" >> ${TMPPLIST} + @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/tmp" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/spec/support/gitlab-git-test.git/refs/heads" >> ${TMPPLIST} @${ECHO_CMD} "@dir ${WWWDIR_REL}/spec/support/gitlab-git-test.git/refs/tags" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared" >> ${TMPPLIST} diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index 9b547fcb27ae..6300800fb135 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1655708590 -SHA256 (gitlab-org-gitlab-foss-418555ba81982c6ee683a39dbdec134d69bebb3f_GL0.tar.gz) = 28f63154e97078b467fa62cca8a4fd657df23b86000c3b931e8eea90833bb025 -SIZE (gitlab-org-gitlab-foss-418555ba81982c6ee683a39dbdec134d69bebb3f_GL0.tar.gz) = 102270473 +TIMESTAMP = 1655815358 +SHA256 (gitlab-org-gitlab-foss-6bea43795252f980eeee7ce67413ef440da88a31_GL0.tar.gz) = cab6e5eaf02b0b814480253c0afd4a2c3589ac898f38dd507825f79419d9e28b +SIZE (gitlab-org-gitlab-foss-6bea43795252f980eeee7ce67413ef440da88a31_GL0.tar.gz) = 103078383 diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index 5e293c0db110..bd6b8e3b25d1 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,17 +1,14 @@ ---- Gemfile.orig 2022-05-27 19:14:13 UTC +--- Gemfile.orig 2022-06-21 10:16:23 UTC +++ Gemfile -@@ -2,9 +2,9 @@ +@@ -2,7 +2,7 @@ source 'https://rubygems.org' -gem 'rails', '~> 6.1.4.7' +gem 'rails', '~> 6.1.4' --gem 'bootsnap', '~> 1.9.4', require: false -+gem 'bootsnap', '~> 1.9', require: false + gem 'bootsnap', '~> 1.12.0', require: false - # Responders respond_to and respond_with - gem 'responders', '~> 3.0' @@ -92,7 +92,7 @@ gem 'gpgme', '~> 2.0.19' # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master @@ -30,7 +27,7 @@ # Colored output to console gem 'rainbow', '~> 3.0' -@@ -334,87 +334,19 @@ gem 'batch-loader', '~> 2.0.1' +@@ -334,89 +334,19 @@ gem 'batch-loader', '~> 2.0.1' gem 'peek', '~> 1.1' # Snowplow events tracking @@ -46,7 +43,7 @@ gem 'warning', '~> 1.2.0' -group :development do -- gem 'lefthook', '~> 0.7.0', require: false +- gem 'lefthook', '~> 0.8.0', require: false - gem 'rubocop' - gem 'solargraph', '~> 0.44.3', require: false - @@ -83,7 +80,7 @@ - gem 'spring', '~> 2.1.0' - gem 'spring-commands-rspec', '~> 1.0.4' - -- gem 'gitlab-styles', '~> 7.0.0', require: false +- gem 'gitlab-styles', '~> 7.1.0', require: false - - gem 'haml_lint', '~> 0.36.0', require: false - gem 'bundler-audit', '~> 0.7.0.1', require: false @@ -104,10 +101,12 @@ - gem 'test_file_finder', '~> 0.1.3' - - gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup' +- +- gem 'pact', '~> 1.12' -end - group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 3.0', require: false + gem 'gitlab-dangerfiles', '~> 3.4.0', require: false end -group :development, :test, :coverage do @@ -120,7 +119,7 @@ # Gems required in omnibus-gitlab pipeline group :development, :test, :omnibus do # Using a fork until https://github.com/pivotal/LicenseFinder/pull/816 is -@@ -423,30 +355,6 @@ group :development, :test, :omnibus do +@@ -425,30 +355,6 @@ group :development, :test, :omnibus do gem 'gitlab-license_finder', '~> 6.0', require: false end @@ -151,10 +150,12 @@ gem 'octokit', '~> 4.15' # Updating this gem version here is deprecated. See: -@@ -545,3 +453,6 @@ gem 'ipaddress', '~> 0.8.3' +@@ -547,5 +453,8 @@ gem 'ipaddress', '~> 0.8.3' gem 'parslet', '~> 1.8' gem 'ipynbdiff', '0.4.7' + +gem 'parser' + + + gem 'ed25519', '~> 1.3.0' diff --git a/www/gitlab-ce/pkg-message b/www/gitlab-ce/pkg-message index a8d4aa9e47e4..2d4413e0ed76 100644 --- a/www/gitlab-ce/pkg-message +++ b/www/gitlab-ce/pkg-message @@ -6,7 +6,7 @@ Gitlab was installed successfully. You now need to set up the various components of Gitlab, so please follow the instructions in the guide at: -https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/15.0-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/15.1-freebsd.md EOM type: install } @@ -20,7 +20,7 @@ EOM If you just installed an major upgrade of GitLab, for example you switched from 14.5.x to 14.6.x, please follow the instructions in the guide at: -https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/14.10-15.0-freebsd.md +https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/15.0-15.1-freebsd.md If you just installed an minor upgrade of GitLab please follow the instructions in the guide at: diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile index b81b156673b8..be3d6a18cf69 100644 --- a/www/gitlab-workhorse/Makefile +++ b/www/gitlab-workhorse/Makefile @@ -1,7 +1,7 @@ # Created by: Torsten Zuehlsdorff PORTNAME= gitlab-workhorse -PORTVERSION= 15.0.3 +PORTVERSION= 15.1.0 DISTVERSIONPREFIX= v PORTREVISION= 0 CATEGORIES= www @@ -26,7 +26,7 @@ USE_GITLAB= yes GL_ACCOUNT= gitlab-org GL_PROJECT= gitlab-foss # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags -GL_COMMIT= 418555ba81982c6ee683a39dbdec134d69bebb3f +GL_COMMIT= 6bea43795252f980eeee7ce67413ef440da88a31 # for go dependencies # Gitlab hosts there dependencies on their own platform and not on go-proxy diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index fd9e90a278f8..366a7dd8b3a9 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1655704308 -SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-418555ba81982c6ee683a39dbdec134d69bebb3f_GL0/go.mod) = d6aef2452999d5057ed4021da26d1746dae7b26adab96a836e1ae8474d4d8ecc -SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-418555ba81982c6ee683a39dbdec134d69bebb3f_GL0/go.mod) = 1647 -SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-418555ba81982c6ee683a39dbdec134d69bebb3f_GL0/gitlab-org-gitlab-foss-418555ba81982c6ee683a39dbdec134d69bebb3f_GL0.tar.gz) = 28f63154e97078b467fa62cca8a4fd657df23b86000c3b931e8eea90833bb025 -SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-418555ba81982c6ee683a39dbdec134d69bebb3f_GL0/gitlab-org-gitlab-foss-418555ba81982c6ee683a39dbdec134d69bebb3f_GL0.tar.gz) = 102270473 +TIMESTAMP = 1655815324 +SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-6bea43795252f980eeee7ce67413ef440da88a31_GL0/go.mod) = 4365772ecf544e811d23b0603124cff02091d8d5318d85bd35fcb91324df46ae +SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-6bea43795252f980eeee7ce67413ef440da88a31_GL0/go.mod) = 5781 +SHA256 (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-6bea43795252f980eeee7ce67413ef440da88a31_GL0/gitlab-org-gitlab-foss-6bea43795252f980eeee7ce67413ef440da88a31_GL0.tar.gz) = cab6e5eaf02b0b814480253c0afd4a2c3589ac898f38dd507825f79419d9e28b +SIZE (go/www_gitlab-workhorse/gitlab-org-gitlab-foss-6bea43795252f980eeee7ce67413ef440da88a31_GL0/gitlab-org-gitlab-foss-6bea43795252f980eeee7ce67413ef440da88a31_GL0.tar.gz) = 103078383