From nobody Mon Oct 23 16:05:05 2023 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 4SDg4x6byDz4yCv7; Mon, 23 Oct 2023 16:05: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 4SDg4x4V4dz4Qg3; Mon, 23 Oct 2023 16:05:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698077105; 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=trgE6FLHWvGZzpstCSTy635LUw4VpOXeYCi6PuqXDQE=; b=Rf3StTdUceAl26LOFDrC+lU5yz96rZmgi5l6twkmjb8faYzEmrcryE1d7Kwx0v3NX+CL5L 6DBF2KuoWRcbO6PMRPWKKGjkSfKmYT4kpcgS+J50WLy6+WPsCDVWccTIUQqandqwaYkKZY moWjUJX69lGmpsflXzXjK+wT4K7DnpExkDKHrANvrAYrvTDyFLxzlHuaVA6KOCKHxlqmKO DBWZwyM2MFnrPyyDZtzBnj62dzJWFUBhUwLXL+fsxxHlJ43DCfCsGXdvWRb1X430EOjFsP xN4ezdYKDM4BKVSL2PaliZNoG35iIyJuEal+ece2+iqo+VQO98KhFGEmQIbXyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698077105; a=rsa-sha256; cv=none; b=LD6E5Kjx+KBZpMors/qbxmDZBIej0+zmkwJbVkoyJbkWnqLQBFMvmQ6fjs0++FgfwK5hFs IUp70LsKmQWJpgCd58yc0W5HTzIsKkUPwnnW8sO7qwROd6vrQ6goyj5J/EmIy3pXk/e8uO Zva7oR3xYgRMm4aA55PHHAUpSU2olzeU3B21R/leXwVoA8C9uG8hRzem7bP2J8ZUP3OdYC 0x7ze7MbWtLsFuZAjVoBoEfVT4HMJZmEAsb+J5ALXtvQ71oEttD8qTQx5hfzKOagv+We7o PSO9IrxI5dJ43VMoLgajNrcpC+C2gTVFbUJ8sWxH+5VRYhin0r+EDxmWej5YWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698077105; 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=trgE6FLHWvGZzpstCSTy635LUw4VpOXeYCi6PuqXDQE=; b=hsnutUvo9iSo4ACCe07GhIKEX0aW6uFli96myUyX/z9H0ahUr6wUcxIxLrx4J+CKJRrrbv ON5VF8MyhnafHiMIN8El/MitJ2OkDCizRf+L+/ILZthTxkU2kSyQUy5nStHVoYD4PIqIrb 4QIiwg/YyYGpjWy3VUPc6dS9JTjr6kHwchYGsQpF0Hulq0WQr9XBlKWcqVs+kOPMhFTBEC 4wBb6DrZxpC2dXB8CV8J+WGq0EylLYsCaApAASQOL7MMN+QgRBLQLjK47VYOLVGLCdQFX4 RjSv2kvIcRx4389vl6MdAopH8IrNFLw0jFDgIvnk4KOPTK8TO/RcbcQGuFlUcA== 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 4SDg4x3YbdzmXS; Mon, 23 Oct 2023 16:05:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39NG55RO030170; Mon, 23 Oct 2023 16:05:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39NG55kD030167; Mon, 23 Oct 2023 16:05:05 GMT (envelope-from git) Date: Mon, 23 Oct 2023 16:05:05 GMT Message-Id: <202310231605.39NG55kD030167@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: 8559875356d1 - main - www/gitlab-ce: mahor upgrade to 16.5.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: 8559875356d1bae2f2fa1ee26e0b0f8b6f9e7d60 Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=8559875356d1bae2f2fa1ee26e0b0f8b6f9e7d60 commit 8559875356d1bae2f2fa1ee26e0b0f8b6f9e7d60 Author: Matthias Fechner AuthorDate: 2023-10-23 16:03:35 +0000 Commit: Matthias Fechner CommitDate: 2023-10-23 16:04:21 +0000 www/gitlab-ce: mahor upgrade to 16.5.0 Changelog: https://about.gitlab.com/releases/2023/10/22/gitlab-16-5-released/ --- devel/gitaly/Makefile | 4 +- devel/gitaly/distinfo | 10 +- devel/gitlab-shell/Makefile | 2 +- devel/gitlab-shell/distinfo | 10 +- net/gitlab-agent/Makefile | 2 +- net/gitlab-agent/distinfo | 10 +- textproc/gitlab-elasticsearch-indexer/Makefile | 2 +- textproc/gitlab-elasticsearch-indexer/distinfo | 10 +- www/gitlab-ce/Makefile | 65 +++-- www/gitlab-ce/distinfo | 6 +- www/gitlab-ce/files/patch-Gemfile | 262 ++++++++++----------- .../files/patch-config_gitlab.yml.example | 14 +- www/gitlab-ce/files/patch-config_puma.rb.example | 12 +- www/gitlab-pages/Makefile | 2 +- www/gitlab-pages/distinfo | 10 +- www/gitlab-workhorse/Makefile | 2 +- www/gitlab-workhorse/distinfo | 10 +- 17 files changed, 206 insertions(+), 227 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index f3d7bd9d0283..5b07ee337c3e 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitaly -DISTVERSION= 16.4.1 +DISTVERSION= 16.5.0 DISTVERSIONPREFIX= v CATEGORIES= devel @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # it fixes segfaults reported here: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=259848 # define dependencies that are required for build and run under MY_DEPENDS -MY_DEPENDS= git>=2.41.0:devel/git +MY_DEPENDS= git>=2.42.0:devel/git BUILD_DEPENDS= bash>0:shells/bash \ ${LOCALBASE}/bin/cmake:devel/cmake-core \ ${MY_DEPENDS} diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index a67eac68493d..1153c25f4580 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1695965694 -SHA256 (go/devel_gitaly/gitaly-v16.4.1/go.mod) = 297ad42064334fe0bdeb8b428bffb4d36edffa43233dfa9c33a24c39d5d3c2f3 -SIZE (go/devel_gitaly/gitaly-v16.4.1/go.mod) = 10499 -SHA256 (go/devel_gitaly/gitaly-v16.4.1/gitaly-v16.4.1.tar.bz2) = 699024fba715ef6189dd4ffa4f0c52714bbc473e43b200a11979e73309dbb904 -SIZE (go/devel_gitaly/gitaly-v16.4.1/gitaly-v16.4.1.tar.bz2) = 2450324 +TIMESTAMP = 1698069958 +SHA256 (go/devel_gitaly/gitaly-v16.5.0/go.mod) = c228a15141524a153c43ebc1b79a26cbe18baaf6e7966f5ca718557047a3bf18 +SIZE (go/devel_gitaly/gitaly-v16.5.0/go.mod) = 10529 +SHA256 (go/devel_gitaly/gitaly-v16.5.0/gitaly-v16.5.0.tar.bz2) = 3a67b2b6a43638768cbadd46364b22e765730fb48ebfd2dc44b5c3f316b02837 +SIZE (go/devel_gitaly/gitaly-v16.5.0/gitaly-v16.5.0.tar.bz2) = 2484568 diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile index 1a3e0df5b3a8..47acb54aef5d 100644 --- a/devel/gitlab-shell/Makefile +++ b/devel/gitlab-shell/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-shell -PORTVERSION= 14.28.0 +PORTVERSION= 14.29.0 DISTVERSIONPREFIX= v CATEGORIES= devel diff --git a/devel/gitlab-shell/distinfo b/devel/gitlab-shell/distinfo index 65883998ebb8..b8875fe9eb34 100644 --- a/devel/gitlab-shell/distinfo +++ b/devel/gitlab-shell/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1695535027 -SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.28.0/go.mod) = 2292bfa79e6f9f98d5b482bd81b2dfe6bc95076d046085359a0f9019b306f462 -SIZE (go/devel_gitlab-shell/gitlab-shell-v14.28.0/go.mod) = 4767 -SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.28.0/gitlab-shell-v14.28.0.tar.bz2) = cfb56533b26d55e99ee807c50fbb09c170f62522b0a58ef7652747ab645b3dcc -SIZE (go/devel_gitlab-shell/gitlab-shell-v14.28.0/gitlab-shell-v14.28.0.tar.bz2) = 140420 +TIMESTAMP = 1698070113 +SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.29.0/go.mod) = b9545469fc1ff91969adbb05cc7cc19976d63f8ae097f857bcdabd824c804412 +SIZE (go/devel_gitlab-shell/gitlab-shell-v14.29.0/go.mod) = 4839 +SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.29.0/gitlab-shell-v14.29.0.tar.bz2) = ee3edbc89fa0d8314afad7fc3e208390f4aca02ab96487118b42f2fca2d63326 +SIZE (go/devel_gitlab-shell/gitlab-shell-v14.29.0/gitlab-shell-v14.29.0.tar.bz2) = 140791 diff --git a/net/gitlab-agent/Makefile b/net/gitlab-agent/Makefile index 0536c5f16e64..0840f34c1517 100644 --- a/net/gitlab-agent/Makefile +++ b/net/gitlab-agent/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-agent -PORTVERSION= 16.4.0 +PORTVERSION= 16.5.0 DISTVERSIONPREFIX= v CATEGORIES= net diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo index 47dcd855deff..e392e437a728 100644 --- a/net/gitlab-agent/distinfo +++ b/net/gitlab-agent/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1694668301 -SHA256 (go/net_gitlab-agent/gitlab-agent-v16.4.0/v16.4.0.mod) = b603def5ce9b1a2ae64aacfc17a9aedf080f79ac5ec581b014607cb06e144284 -SIZE (go/net_gitlab-agent/gitlab-agent-v16.4.0/v16.4.0.mod) = 7101 -SHA256 (go/net_gitlab-agent/gitlab-agent-v16.4.0/v16.4.0.zip) = 4aabf5a3e0c86426fd57d3d6de07784b19f39aba064ab6b7438d34e4fa8c78c9 -SIZE (go/net_gitlab-agent/gitlab-agent-v16.4.0/v16.4.0.zip) = 1157123 +TIMESTAMP = 1698070557 +SHA256 (go/net_gitlab-agent/gitlab-agent-v16.5.0/v16.5.0.mod) = e7909ae4949d26fb6600859c36e27a98dc977f804963d10e81424f5b116e3a35 +SIZE (go/net_gitlab-agent/gitlab-agent-v16.5.0/v16.5.0.mod) = 7177 +SHA256 (go/net_gitlab-agent/gitlab-agent-v16.5.0/v16.5.0.zip) = 2aeafd1ec137810eb6cd86e77e183acadff3ea40fe69985f97fd5a40f02f37f6 +SIZE (go/net_gitlab-agent/gitlab-agent-v16.5.0/v16.5.0.zip) = 1223840 diff --git a/textproc/gitlab-elasticsearch-indexer/Makefile b/textproc/gitlab-elasticsearch-indexer/Makefile index 5369d2df5631..45202ffdc601 100644 --- a/textproc/gitlab-elasticsearch-indexer/Makefile +++ b/textproc/gitlab-elasticsearch-indexer/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-elasticsearch-indexer -PORTVERSION= 4.3.10 +PORTVERSION= 4.4.0 DISTVERSIONPREFIX= v CATEGORIES= textproc diff --git a/textproc/gitlab-elasticsearch-indexer/distinfo b/textproc/gitlab-elasticsearch-indexer/distinfo index 804d975198fc..b5a8732a0543 100644 --- a/textproc/gitlab-elasticsearch-indexer/distinfo +++ b/textproc/gitlab-elasticsearch-indexer/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1695114406 -SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.3.10/go.mod) = 4058362934f01b091f9403702ae1a01a0977042475d35bf21301dd67765ac767 -SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.3.10/go.mod) = 4469 -SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.3.10/gitlab-elasticsearch-indexer-v4.3.10.tar.bz2) = 8b3a6a2eda55fd3bbe9e0d186d20a9c141cbba05f5be98b1d8d5e0d474631cbc -SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.3.10/gitlab-elasticsearch-indexer-v4.3.10.tar.bz2) = 55610 +TIMESTAMP = 1698070591 +SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.4.0/go.mod) = 3c01eb1e7df33e086f3c422f277e06374ec55ff4b9bf006fc10586eb86d186f6 +SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.4.0/go.mod) = 4669 +SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.4.0/gitlab-elasticsearch-indexer-v4.4.0.tar.bz2) = 8d182bdb3c103325c952af0a941fdab1fa1db2ffc00c8458dc9ea3b75a5edc25 +SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.4.0/gitlab-elasticsearch-indexer-v4.4.0.tar.bz2) = 58801 diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 97d611fcb6c1..38555e3a37fc 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,7 +1,6 @@ PORTNAME= gitlab-ce -PORTVERSION= 16.4.1 +PORTVERSION= 16.5.0 DISTVERSIONPREFIX= v -PORTREVISION= 4 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -20,10 +19,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE # mail/rubygem-net-pop is required as ruby 3.1 removed it MY_DEPENDS= git>=2.41.0:devel/git \ gitaly>=${PORTVERSION}:devel/gitaly \ - gitlab-elasticsearch-indexer>=4.3.10:textproc/gitlab-elasticsearch-indexer \ - gitlab-agent>=16.4.0:net/gitlab-agent \ + gitlab-elasticsearch-indexer>=4.4.0:textproc/gitlab-elasticsearch-indexer \ + gitlab-agent>=16.5.0:net/gitlab-agent \ gitlab-pages>=${PORTVERSION}:www/gitlab-pages \ - gitlab-shell>=14.28.0:devel/gitlab-shell \ + gitlab-shell>=14.29.0:devel/gitlab-shell \ gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \ redis>=6.2.11:databases/redis \ yarn${NODEJS_SUFFIX}>=1.10.0:www/yarn${NODEJS_SUFFIX} \ @@ -32,18 +31,17 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-net-smtp>=0:mail/rubygem-net-smtp \ rubygem-net-pop>=0:mail/rubygem-net-pop \ rubygem-psych3>=3.1<4:textproc/rubygem-psych3 \ - rubygem-rails70>=7.0.6<7.1:www/rubygem-rails70 \ + rubygem-rails70>=7.0.8<7.1:www/rubygem-rails70 \ rubygem-vite_rails-rails70>=0:devel/rubygem-vite_rails-rails70 \ rubygem-bootsnap>=1.16.0<1.17:devel/rubygem-bootsnap \ rubygem-openssl>=3.0<4:security/rubygem-openssl \ rubygem-ipaddr>=1.2.5<1.3:net/rubygem-ipaddr \ rubygem-responders-rails70>=3.0<4.0:www/rubygem-responders-rails70 \ rubygem-sprockets3>=3.7<3.8:devel/rubygem-sprockets3 \ - rubygem-view_component-rails70>=3.5.0<3.6:devel/rubygem-view_component-rails70 \ + rubygem-view_component-rails70>=3.6.0<3.7:devel/rubygem-view_component-rails70 \ rubygem-pg>=1.5.4<1.6:databases/rubygem-pg \ rubygem-neighbor>=0.2.3<0.3:databases/rubygem-neighbor \ rubygem-rugged>=1.6<2:devel/rubygem-rugged \ - rubygem-grape-path-helpers>=1.7.1<1.8:devel/rubygem-grape-path-helpers \ rubygem-faraday1>=1.10.0<3:www/rubygem-faraday1 \ rubygem-marginalia>=1.11.1<1.12:databases/rubygem-marginalia \ rubygem-declarative_policy>=1.1.0<1.2:security/rubygem-declarative_policy \ @@ -57,7 +55,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-omniauth-auth0>=3.1.0<3.2.0:net/rubygem-omniauth-auth0 \ rubygem-omniauth-azure-activedirectory-v2>=2.0<3:net/rubygem-omniauth-azure-activedirectory-v2 \ rubygem-omniauth-dingtalk-oauth2>=1.0.1<2:security/rubygem-omniauth-dingtalk-oauth2 \ - rubygem-omniauth-alicloud>=2.0.1<2.1:security/rubygem-omniauth-alicloud \ + rubygem-omniauth-alicloud>=3.0.0<3.1:security/rubygem-omniauth-alicloud \ rubygem-omniauth-facebook>=4.0.0:net/rubygem-omniauth-facebook \ rubygem-omniauth-github>=2.0.1<2.1:net/rubygem-omniauth-github \ rubygem-omniauth-google-oauth2>=1.1<2:net/rubygem-omniauth-google-oauth2 \ @@ -74,8 +72,8 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-recaptcha>=5.12<6.0:devel/rubygem-recaptcha \ rubygem-akismet>=3.0<4.0:devel/rubygem-akismet \ rubygem-invisible_captcha>=2.1.0<2.2.0:graphics/rubygem-invisible_captcha \ - rubygem-devise-two-factor40-rails70>=4.0.2<4.1:security/rubygem-devise-two-factor40-rails70 \ - rubygem-rqrcode-rails3>=0.1.7<0.2.0:www/rubygem-rqrcode-rails3 \ + rubygem-devise-two-factor41-rails70>=4.1.1<4.2:security/rubygem-devise-two-factor41-rails70 \ + rubygem-rqrcode>=2.2.0<3:www/rubygem-rqrcode \ rubygem-validates_hostname>=1.0.13<1.1.0:dns/rubygem-validates_hostname \ rubygem-rubyzip>=2.3.2<2.4:archivers/rubygem-rubyzip \ rubygem-acme-client>=2.0.9<3:security/rubygem-acme-client \ @@ -86,19 +84,20 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-net-ldap017>=0.17.1<0.18:net/rubygem-net-ldap017 \ rubygem-grape17>=1.7.0<1.8:devel/rubygem-grape17 \ rubygem-grape-entity>=0.10.0<0.11.0,1:devel/rubygem-grape-entity \ - rubygem-rack-cors>=2.0.1<2.1:www/rubygem-rack-cors \ rubygem-grape-swagger>=1.6.1<1.7:devel/rubygem-grape-swagger \ rubygem-grape-swagger-entity>=0.5.1<0.6:devel/rubygem-grape-swagger-entity \ - rubygem-graphql>=1.13.19<1.14:devel/rubygem-graphql \ + rubygem-grape-path-helpers>=1.7.1<1.8:devel/rubygem-grape-path-helpers \ + rubygem-rack-cors>=2.0.1<2.1:www/rubygem-rack-cors \ + rubygem-graphql>=2.0.27<2.1:devel/rubygem-graphql \ + rubygem-graphql-docs>=4.0.0<4.1.0:devel/rubygem-graphql-docs \ rubygem-graphiql-rails>=1.8.0<1.9:devel/rubygem-graphiql-rails \ rubygem-apollo_upload_server>=2.1.0<2.2:net/rubygem-apollo_upload_server \ - rubygem-graphql-docs>=2.1.0<2.2.0:devel/rubygem-graphql-docs \ rubygem-graphlient>=0.5.0<0.6:devel/rubygem-graphlient \ rubygem-ffaker>=2.10<3:devel/rubygem-ffaker \ rubygem-hashie>=5.0.0<5.1:devel/rubygem-hashie \ rubygem-kaminari-rails70>=1.2.2<1.3:www/rubygem-kaminari-rails70 \ rubygem-hamlit>=2.15.0<2.16:www/rubygem-hamlit \ - rubygem-carrierwave>=1.3.2<2.0:www/rubygem-carrierwave \ + rubygem-carrierwave>=1.3.4<2.0:www/rubygem-carrierwave \ rubygem-mini_magick410>=4.10.1<4.11:graphics/rubygem-mini_magick410 \ rubygem-fog-aws>=3.18<4:net/rubygem-fog-aws \ rubygem-fog-core210>=2.1.0<2.1.1:devel/rubygem-fog-core210 \ @@ -121,9 +120,9 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-elasticsearch-model713>=7.2<8:textproc/rubygem-elasticsearch-model713 \ rubygem-elasticsearch-rails>=7.2<8:textproc/rubygem-elasticsearch-rails \ rubygem-elasticsearch-api713>=7.13.3<7.13.4:textproc/rubygem-elasticsearch-api713 \ - rubygem-aws-sdk-core>=3.181.1<4:devel/rubygem-aws-sdk-core \ + rubygem-aws-sdk-core>=3.185.1<4:devel/rubygem-aws-sdk-core \ rubygem-aws-sdk-cloudformation>=1<2:devel/rubygem-aws-sdk-cloudformation \ - rubygem-aws-sdk-s3>=1.134.0<2:devel/rubygem-aws-sdk-s3 \ + rubygem-aws-sdk-s3>=1.136.0<2:devel/rubygem-aws-sdk-s3 \ rubygem-faraday_middleware-aws-sigv403>=0.3.0<0.4:devel/rubygem-faraday_middleware-aws-sigv403 \ rubygem-typhoeus>=1.4.0<1.5:www/rubygem-typhoeus \ rubygem-html-pipeline>=2.14.3<2.15:textproc/rubygem-html-pipeline \ @@ -132,7 +131,6 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-commonmarker>=0.23.10<0.24:textproc/rubygem-commonmarker \ rubygem-kramdown23>=2.3.1<2.4:textproc/rubygem-kramdown23 \ rubygem-redcloth>=4.3.2<4.4.0:www/rubygem-redcloth \ - rubygem-rdoc63>=6.3.2<7:devel/rubygem-rdoc63 \ rubygem-org-ruby>=0.9.12<0.10.0:textproc/rubygem-org-ruby \ rubygem-creole>=0.5.0<0.6.0:textproc/rubygem-creole \ rubygem-wikicloth081>=0.8.1<0.8.2:textproc/rubygem-wikicloth081 \ @@ -141,14 +139,14 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-asciidoctor-plantuml00>=0.0.16<0.1:textproc/rubygem-asciidoctor-plantuml00 \ rubygem-asciidoctor-kroki>=0.8.0<0.9:textproc/rubygem-asciidoctor-kroki \ rubygem-rouge>=4.1.3<4.2:textproc/rubygem-rouge \ - rubygem-truncato>=0.7.11<0.8.0:textproc/rubygem-truncato \ + rubygem-truncato>=0.7.12<0.8.0:textproc/rubygem-truncato \ rubygem-nokogiri>=1.15.4<2:textproc/rubygem-nokogiri \ rubygem-icalendar>=0:devel/rubygem-icalendar \ rubygem-diffy>=3.4<4:textproc/rubygem-diffy \ rubygem-diff_match_patch>=0.1.0<0.2.0:textproc/rubygem-diff_match_patch \ rubygem-rack22>=2.2.8,3<2.3,3:www/rubygem-rack22 \ rubygem-rack-timeout>=0.6.3<0.7:www/rubygem-rack-timeout \ - rubygem-puma>=6.3.1<7:www/rubygem-puma \ + rubygem-puma>=6.4<7:www/rubygem-puma \ rubygem-sd_notify>=0.1.1<0.2:devel/rubygem-sd_notify \ rubygem-state_machines-activerecord08>=0.8.0<0.9.0:databases/rubygem-state_machines-activerecord08 \ rubygem-acts-as-taggable-on>=9.0<10:www/rubygem-acts-as-taggable-on \ @@ -159,33 +157,31 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-httparty>=0.21.0<0.22:www/rubygem-httparty \ rubygem-rainbow>=3.1.1<4.0:devel/rubygem-rainbow \ rubygem-ruby-progressbar>=1.11<2:devel/rubygem-ruby-progressbar \ - rubygem-re2>=2.0.0<2.0.1:devel/rubygem-re2 \ + rubygem-re2>=2.1.3<2.2:devel/rubygem-re2 \ rubygem-semver_dialects12>=1.2.1<1.3:devel/rubygem-semver_dialects12 \ rubygem-version_sorter>=2.3<3:textproc/rubygem-version_sorter \ rubygem-js_regex>=3.8<4.0:textproc/rubygem-js_regex \ rubygem-device_detector>=0:devel/rubygem-device_detector \ rubygem-redis4>=4.8.0<4.8.2:databases/rubygem-redis4 \ - rubygem-connection_pool>=2.2.5<3.0:net/rubygem-connection_pool \ + rubygem-connection_pool>=2.4.1<3.0:net/rubygem-connection_pool \ rubygem-redis-actionpack-rails70>=5.3.0<5.4:databases/rubygem-redis-actionpack-rails70 \ rubygem-discordrb-webhooks>=3.4<4.0:net-im/rubygem-discordrb-webhooks \ rubygem-jira-ruby21>=2.1.4<2.2:devel/rubygem-jira-ruby21 \ rubygem-atlassian-jwt>=0.2.0<0.3.0:www/rubygem-atlassian-jwt \ rubygem-slack-messenger>=2.3.4<2.4.0:devel/rubygem-slack-messenger \ - rubygem-hangouts-chat>=0.0.5<0.1.0:net/rubygem-hangouts-chat \ - rubygem-asana1>=0.10.13<3:www/rubygem-asana1 \ rubygem-ruby-fogbugz>=0.3.0<0.4.0:devel/rubygem-ruby-fogbugz \ rubygem-kubeclient>=4.11.0<4.12.0:www/rubygem-kubeclient \ rubygem-ruby-openai37>=3.7<4:www/rubygem-ruby-openai37 \ rubygem-circuitbox>=2.0.0<2.1:www/rubygem-circuitbox \ rubygem-sanitize60>=6.0.2<6.1:textproc/rubygem-sanitize60 \ rubygem-babosa>=2.0<3:textproc/rubygem-babosa \ - rubygem-loofah>=2.21.3<2.22:textproc/rubygem-loofah \ + rubygem-loofah>=2.21.4<2.22:textproc/rubygem-loofah \ rubygem-licensee>=9.16<10:devel/rubygem-licensee \ rubygem-charlock_holmes>=0.7.7<0.8.0:textproc/rubygem-charlock_holmes \ rubygem-ruby-magic>=0.6<1:devel/rubygem-ruby-magic \ rubygem-fast_blank>=1.0.1<1.1:devel/rubygem-fast_blank \ rubygem-gitlab-chronic>=0.10.5<0.11.0:devel/rubygem-gitlab-chronic \ - rubygem-gitlab_chronic_duration>=0.11<1:devel/rubygem-gitlab_chronic_duration \ + rubygem-gitlab_chronic_duration>=0.12<1:devel/rubygem-gitlab_chronic_duration \ rubygem-rack-proxy>=0.7.7<0.8.0:www/rubygem-rack-proxy \ rubygem-sassc-rails-rails70>=2.1.0<2.2.0:textproc/rubygem-sassc-rails-rails70 \ rubygem-autoprefixer-rails1025>=10.2.5.1<10.2.6:textproc/rubygem-autoprefixer-rails1025 \ @@ -210,13 +206,13 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-gettext_i18n_rails_js-rails70>=1.3<2.0:devel/rubygem-gettext_i18n_rails_js-rails70 \ rubygem-gettext>=3.3<4:devel/rubygem-gettext \ rubygem-batch-loader>=2.0.1<2.1:devel/rubygem-batch-loader \ - rubygem-peek-rails70>=1.1.0<2.0:devel/rubygem-peek-rails70 \ + rubygem-peek-rails70>=1.1<2.0:devel/rubygem-peek-rails70 \ rubygem-snowplow-tracker>=0.8.0<1:devel/rubygem-snowplow-tracker \ rubygem-webrick>=1.8.1<1.9:www/rubygem-webrick \ - rubygem-prometheus-client-mmap>=0.28<0.29:devel/rubygem-prometheus-client-mmap \ + rubygem-prometheus-client-mmap>=0.28.1<0.29:devel/rubygem-prometheus-client-mmap \ rubygem-warning>=1.3.0<1.4:devel/rubygem-warning \ + rubygem-gitlab-dangerfiles>=4.3.2<4.4:devel/rubygem-gitlab-dangerfiles \ rubygem-license_finder>=7.0.0<8:devel/rubygem-license_finder \ - rubygem-gitlab-dangerfiles>=4.0.0<4.1:devel/rubygem-gitlab-dangerfiles \ rubygem-rspec>=3.0<4:devel/rubygem-rspec \ rubygem-octokit6>=6.0<7:net/rubygem-octokit6 \ rubygem-gitlab-mail_room>=0.0.23<0.1.0:mail/rubygem-gitlab-mail_room \ @@ -225,7 +221,6 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-stackprof>=0.2.25<0.3:devel/rubygem-stackprof \ rubygem-rbtrace>=0.4.14<1.0:devel/rubygem-rbtrace \ rubygem-memory_profiler>=1.0<2.0:devel/rubygem-memory_profiler \ - rubygem-benchmark-memory>=0.1<1.0:benchmarks/rubygem-benchmark-memory \ rubygem-activerecord-explain-analyze>=0.1<1.0:databases/rubygem-activerecord-explain-analyze \ rubygem-oauth2>=2.0<3:net/rubygem-oauth2 \ rubygem-health_check-rails70>=3.0<4:devel/rubygem-health_check-rails70 \ @@ -234,10 +229,10 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-net-ntp>0:net/rubygem-net-ntp \ rubygem-ssh_data>=1.3<2:security/rubygem-ssh_data \ rubygem-spamcheck>=1.3.0<1.4:net/rubygem-spamcheck \ - rubygem-gitaly>=16.3.0.rc1<16.4.0:net/rubygem-gitaly \ + rubygem-gitaly>=16.5.0.rc1<16.6.0:net/rubygem-gitaly \ rubygem-kas-grpc>=0.2.0,1<0.3.0,1:net/rubygem-kas-grpc \ - rubygem-grpc>=1.55.0<2:net/rubygem-grpc \ - rubygem-google-protobuf>=3.24.3<4:devel/rubygem-google-protobuf \ + rubygem-grpc>=1.58.0<2:net/rubygem-grpc \ + rubygem-google-protobuf>=3.24.4<4:devel/rubygem-google-protobuf \ rubygem-toml-rb>=2.2.0<3:www/rubygem-toml-rb \ rubygem-flipper026>=0.26.2<0.27:devel/rubygem-flipper026 \ rubygem-flipper-active_record-rails70>=0.26.2<0.27:databases/rubygem-flipper-active_record-rails70 \ @@ -264,10 +259,10 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-ipaddress>=0.8.3<0.9:net/rubygem-ipaddress \ rubygem-parslet1>=1.8<2:textproc/rubygem-parslet1 \ rubygem-ed25519>=1.3.0<1.4:security/rubygem-ed25519 \ - rubygem-parser>=0:devel/rubygem-parser \ + rubygem-parser>=3.2.2.4:devel/rubygem-parser \ rubygem-cvss-suite>=3.0.1<3.1:security/rubygem-cvss-suite \ rubygem-arr-pm>=0.0.12<0.1:devel/rubygem-arr-pm \ - rubygem-devfile>=0.0.22.p.a1<0.0.23:net/rubygem-devfile \ + rubygem-devfile>=0.0.23.p.a1<0.0.24:net/rubygem-devfile \ rubygem-CFPropertyList>=3.0.0<3.1:devel/rubygem-CFPropertyList \ rubygem-app_store_connect>=0:net/rubygem-app_store_connect \ rubygem-telesignenterprise>=2.2<3:devel/rubygem-telesignenterprise \ diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index e0d60304fc62..fe10fced991b 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1696428405 -SHA256 (gitlab-foss-v16.4.1.tar.bz2) = 1a408099b16bedfa4bbaa437bac75292c06d85fd6fe5ba80f3bc02d4515a83ae -SIZE (gitlab-foss-v16.4.1.tar.bz2) = 96987223 +TIMESTAMP = 1698065244 +SHA256 (gitlab-foss-v16.5.0.tar.bz2) = 5b9091e9d815e102fd858d258cf65640a5774d34a5a79906b5f27e03ae235848 +SIZE (gitlab-foss-v16.5.0.tar.bz2) = 92735315 diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index 6689126ecf28..c97f50a4dba2 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -1,205 +1,181 @@ ---- Gemfile.orig 2023-09-21 08:56:19 UTC +--- Gemfile.orig 2023-10-20 08:41:39 UTC +++ Gemfile -@@ -48,7 +48,7 @@ gem 'neighbor', '~> 0.2.3' - gem 'rugged', '~> 1.6' - gem 'grape-path-helpers', '~> 1.7.1' +@@ -56,7 +56,7 @@ gem 'neighbor', '~> 0.2.3' # rubocop:todo Gemfile/Miss --gem 'faraday', '~> 1.0' -+gem 'faraday', '>= 1.0' - gem 'marginalia', '~> 1.11.1' + gem 'rugged', '~> 1.6' # rubocop:todo Gemfile/MissingFeatureCategory + +-gem 'faraday', '~> 1.0' # rubocop:todo Gemfile/MissingFeatureCategory ++gem 'faraday', '>= 1.0' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'marginalia', '~> 1.11.1' # rubocop:todo Gemfile/MissingFeatureCategory # Authorization -@@ -68,8 +68,8 @@ gem 'omniauth-azure-activedirectory-v2', '~> 2.0' - gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md - gem 'omniauth-dingtalk-oauth2', '~> 1.0' - gem 'omniauth-alicloud', '~> 2.0.1' --gem 'omniauth-facebook', '~> 4.0.0' --gem 'omniauth-github', '2.0.1' -+gem 'omniauth-facebook', '>= 4.0.0' -+gem 'omniauth-github', '~> 2.0.1' - gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md - gem 'omniauth-google-oauth2', '~> 1.1' - gem 'omniauth-oauth2-generic', '~> 0.2.2' -@@ -80,7 +80,7 @@ gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/o - gem 'omniauth_openid_connect', '~> 0.6.1' +@@ -76,8 +76,8 @@ gem 'omniauth-azure-activedirectory-v2', '~> 2.0' # ru + gem 'omniauth-azure-oauth2', '~> 0.0.9', path: 'vendor/gems/omniauth-azure-oauth2' # See gem README.md # rubocop:todo Gemfile/MissingFeatureCategory + gem 'omniauth-dingtalk-oauth2', '~> 1.0' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'omniauth-alicloud', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory +-gem 'omniauth-facebook', '~> 4.0.0' # rubocop:todo Gemfile/MissingFeatureCategory +-gem 'omniauth-github', '2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory ++gem 'omniauth-facebook', '>= 4.0.0' # rubocop:todo Gemfile/MissingFeatureCategory ++gem 'omniauth-github', '~> 2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md # rubocop:todo Gemfile/MissingFeatureCategory + gem 'omniauth-google-oauth2', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'omniauth-oauth2-generic', '~> 0.2.2' # rubocop:todo Gemfile/MissingFeatureCategory +@@ -88,7 +88,7 @@ gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/o + gem 'omniauth_openid_connect', '~> 0.6.1' # rubocop:todo Gemfile/MissingFeatureCategory # Locked until Ruby 3.0 upgrade since upgrading will pull in an updated net-smtp gem. # See https://docs.gitlab.com/ee/development/emails.html#rationale. --gem 'openid_connect', '= 1.3.0' -+gem 'openid_connect', '= 1.3.1' - gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md - gem 'omniauth-atlassian-oauth2', '~> 0.2.0' - gem 'rack-oauth2', '~> 1.21.3' -@@ -168,7 +168,7 @@ gem 'gitlab-fog-azure-rm', '~> 1.8.0', require: 'fog/a +-gem 'openid_connect', '= 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory ++gem 'openid_connect', '= 1.3.1' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md # rubocop:todo Gemfile/MissingFeatureCategory + gem 'omniauth-atlassian-oauth2', '~> 0.2.0' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'rack-oauth2', '~> 1.21.3' # rubocop:todo Gemfile/MissingFeatureCategory +@@ -178,7 +178,7 @@ gem 'gitlab-fog-azure-rm', '~> 1.8.0', require: 'fog/a # for Google storage - gem 'google-cloud-storage', '~> 1.44.0' --gem 'google-apis-core', '~> 0.10.0' -+gem 'google-apis-core', '~> 0.10' - gem 'google-apis-compute_v1', '~> 0.57.0' - gem 'google-apis-container_v1', '~> 0.43.0' - gem 'google-apis-container_v1beta1', '~> 0.43.0' -@@ -186,9 +186,9 @@ gem 'seed-fu', '~> 2.3.7' - gem 'elasticsearch-model', '~> 7.2' - gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' - gem 'elasticsearch-api', '7.13.3' --gem 'aws-sdk-core', '~> 3.181.1' -+gem 'aws-sdk-core', '~> 3.181' - gem 'aws-sdk-cloudformation', '~> 1' --gem 'aws-sdk-s3', '~> 1.134.0' -+gem 'aws-sdk-s3', '~> 1.134' - gem 'faraday_middleware-aws-sigv4', '~>0.3.0' - gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections - -@@ -288,7 +288,7 @@ gem 'slack-messenger', '~> 2.3.4' - gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat' - - # Asana integration --gem 'asana', '~> 0.10.13' -+gem 'asana', '>= 0.10.13' + gem 'google-cloud-storage', '~> 1.44.0' # rubocop:todo Gemfile/MissingFeatureCategory +-gem 'google-apis-core', '~> 0.10.0' # rubocop:todo Gemfile/MissingFeatureCategory ++gem 'google-apis-core', '~> 0.10' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'google-apis-compute_v1', '~> 0.57.0' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'google-apis-container_v1', '~> 0.43.0' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'google-apis-container_v1beta1', '~> 0.43.0' # rubocop:todo Gemfile/MissingFeatureCategory +@@ -385,80 +385,10 @@ gem 'prometheus-client-mmap', '~> 0.28', '>= 0.28.1', - # FogBugz integration - gem 'ruby-fogbugz', '~> 0.3.0' -@@ -381,118 +381,15 @@ gem 'prometheus-client-mmap', '~> 0.28', require: 'pro - - gem 'warning', '~> 1.3.0' + gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory -group :development do -- gem 'lefthook', '~> 1.4.7', require: false -- gem 'rubocop' -- gem 'solargraph', '~> 0.47.2', require: false +- gem 'lefthook', '~> 1.5.2', require: false, feature_category: :tooling +- gem 'rubocop', feature_category: :tooling +- gem 'solargraph', '~> 0.47.2', require: false # rubocop:todo Gemfile/MissingFeatureCategory - -- gem 'letter_opener_web', '~> 2.0.0' -- gem 'lookbook', '~> 2.0', '>= 2.0.1' +- gem 'letter_opener_web', '~> 2.0.0' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'lookbook', '~> 2.0', '>= 2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory - - # Better errors handler -- gem 'better_errors', '~> 2.10.1' +- gem 'better_errors', '~> 2.10.1' # rubocop:todo Gemfile/MissingFeatureCategory - -- gem 'sprite-factory', '~> 1.7' +- gem 'sprite-factory', '~> 1.7' # rubocop:todo Gemfile/MissingFeatureCategory - -- gem "listen", "~> 3.7" +- gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory -end - -group :development, :test do -- gem 'deprecation_toolkit', '~> 1.5.1', require: false -- gem 'bullet', '~> 7.0.2' -- gem 'parser', '~> 3.2', '>= 3.2.2.3' -- gem 'pry-byebug' -- gem 'pry-rails', '~> 0.3.9' -- gem 'pry-shell', '~> 0.6.4' +- gem 'deprecation_toolkit', '~> 1.5.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'bullet', '~> 7.1.1' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'parser', '~> 3.2', '>= 3.2.2.4' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'pry-byebug' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'pry-rails', '~> 0.3.9' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'pry-shell', '~> 0.6.4' # rubocop:todo Gemfile/MissingFeatureCategory - -- gem 'awesome_print', require: false +- gem 'awesome_print', require: false # rubocop:todo Gemfile/MissingFeatureCategory - -- gem 'database_cleaner', '~> 1.7.0' -- gem 'factory_bot_rails', '~> 6.2.0' -- gem 'rspec-rails', '~> 6.0.3' +- gem 'database_cleaner', '~> 1.7.0' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'factory_bot_rails', '~> 6.2.0' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'rspec-rails', '~> 6.0.3' # rubocop:todo Gemfile/MissingFeatureCategory - - # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) -- gem 'minitest', '~> 5.11.0' +- gem 'minitest', '~> 5.11.0' # rubocop:todo Gemfile/MissingFeatureCategory - -- gem 'spring', '~> 4.1.0' -- gem 'spring-commands-rspec', '~> 1.0.4' +- gem 'spring', '~> 4.1.0' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'spring-commands-rspec', '~> 1.0.4' # rubocop:todo Gemfile/MissingFeatureCategory - -- gem 'gitlab-styles', '~> 10.1.0', require: false +- gem 'gitlab-styles', '~> 10.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory - -- gem 'haml_lint', '~> 0.40.0', require: false -- gem 'bundler-audit', '~> 0.7.0.1', require: false +- gem 'haml_lint', '~> 0.40.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'bundler-audit', '~> 0.9.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory - - # Benchmarking & profiling -- gem 'benchmark-ips', '~> 2.11.0', require: false -- gem 'benchmark-memory', '~> 0.1', require: false +- gem 'benchmark-ips', '~> 2.11.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'benchmark-memory', '~> 0.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory - -- gem 'knapsack', '~> 1.21.1' -- gem 'crystalball', '~> 0.7.0', require: false +- # Profiling data from CI/CD pipelines +- gem 'influxdb-client', '~> 2.9', require: false # rubocop:todo Gemfile/MissingFeatureCategory - -- gem 'simple_po_parser', '~> 1.1.6', require: false +- gem 'knapsack', '~> 1.21.1', feature_category: :tooling +- gem 'crystalball', '~> 0.7.0', require: false, feature_category: :tooling +- gem 'test_file_finder', '~> 0.1.3', feature_category: :tooling - -- gem 'png_quantizator', '~> 0.2.1', require: false +- gem 'simple_po_parser', '~> 1.1.6', require: false # rubocop:todo Gemfile/MissingFeatureCategory - -- gem 'parallel', '~> 1.19', require: false +- gem 'png_quantizator', '~> 0.2.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory - -- gem 'test_file_finder', '~> 0.1.3' +- gem 'parallel', '~> 1.19', require: false # rubocop:todo Gemfile/MissingFeatureCategory - -- gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup' +- gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup' # rubocop:todo Gemfile/MissingFeatureCategory - -- gem 'pact', '~> 1.63' +- gem 'pact', '~> 1.63' # rubocop:todo Gemfile/MissingFeatureCategory -end - group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 4.0.0', require: false + gem 'gitlab-dangerfiles', '~> 4.3.2', require: false, feature_category: :tooling end -group :development, :test, :coverage do -- gem 'simplecov', '~> 0.21', require: false -- gem 'simplecov-lcov', '~> 0.8.0', require: false -- gem 'simplecov-cobertura', '~> 2.1.0', require: false -- gem 'undercover', '~> 0.4.4', require: false +- gem 'simplecov', '~> 0.21', require: false, feature_category: :tooling +- gem 'simplecov-lcov', '~> 0.8.0', require: false, feature_category: :tooling +- gem 'simplecov-cobertura', '~> 2.1.0', require: false, feature_category: :tooling +- gem 'undercover', '~> 0.4.4', require: false, feature_category: :tooling -end - # Gems required in omnibus-gitlab pipeline group :development, :test, :omnibus do - gem 'license_finder', '~> 7.0', require: false + gem 'license_finder', '~> 7.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory +@@ -470,35 +400,6 @@ group :development, :test, :monorepo do + gem 'rspec_flaky', path: 'gems/rspec_flaky' # rubocop:todo Gemfile/MissingFeatureCategory end --# Gems required in various pipelines --group :development, :test, :monorepo do -- gem 'gitlab-rspec', path: 'gems/gitlab-rspec' -- gem 'rspec_flaky', path: 'gems/rspec_flaky' --end -- -group :test do -- gem 'fuubar', '~> 2.2.0' -- gem 'rspec-retry', '~> 0.6.2' -- gem 'rspec_profiling', '~> 0.0.6' -- gem 'rspec-benchmark', '~> 0.6.0' -- gem 'rspec-parameterized', '~> 1.0', require: false -- -- gem 'capybara', '~> 3.39', '>= 3.39.2' -- gem 'capybara-screenshot', '~> 1.0.26' -- gem 'selenium-webdriver', '= 4.12.0' -- -- gem 'graphlyte', '~> 1.0.0' -- -- gem 'shoulda-matchers', '~> 5.1.0', require: false -- gem 'email_spec', '~> 2.2.0' -- gem 'webmock', '~> 3.19.1' -- gem 'rails-controller-testing' -- gem 'concurrent-ruby', '~> 1.1' -- gem 'test-prof', '~> 1.2.2' -- gem 'rspec_junit_formatter' -- gem 'guard-rspec' -- gem 'axe-core-rspec' +- gem 'fuubar', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'rspec-retry', '~> 0.6.2', feature_category: :tooling +- gem 'rspec_profiling', '~> 0.0.6', feature_category: :tooling +- gem 'rspec-benchmark', '~> 0.6.0', feature_category: :tooling +- gem 'rspec-parameterized', '~> 1.0', require: false, feature_category: :tooling +- +- gem 'capybara', '~> 3.39', '>= 3.39.2' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'capybara-screenshot', '~> 1.0.26' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'selenium-webdriver', '~> 4.14' # rubocop:todo Gemfile/MissingFeatureCategory +- +- gem 'graphlyte', '~> 1.0.0' # rubocop:todo Gemfile/MissingFeatureCategory +- +- gem 'shoulda-matchers', '~> 5.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'email_spec', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'webmock', '~> 3.19.1' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'rails-controller-testing' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'concurrent-ruby', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'test-prof', '~> 1.2.3' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'rspec_junit_formatter' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'guard-rspec' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'axe-core-rspec' # rubocop:todo Gemfile/MissingFeatureCategory - - # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 -- gem 'derailed_benchmarks', require: false +- gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory - -- gem 'gitlab_quality-test_tooling', '~> 1.0.0', require: false +- gem 'gitlab_quality-test_tooling', '~> 1.3.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory -end - - gem 'octokit', '~> 6.0' + gem 'octokit', '~> 6.0' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'gitlab-mail_room', '~> 0.0.23', require: 'mail_room' -@@ -530,7 +427,7 @@ gem 'gitaly', '~> 16.3.0-rc1' - # KAS GRPC protocol definitions - gem 'kas-grpc', '~> 0.2.0' - --gem 'grpc', '~> 1.55.0' -+gem 'grpc', '~> 1.55' - - gem 'google-protobuf', '~> 3.24', '>= 3.24.3' - -@@ -551,7 +448,7 @@ gem 'grape_logging', '~> 1.8' - gem 'gitlab-net-dns', '~> 0.9.2' + gem 'gitlab-mail_room', '~> 0.0.23', require: 'mail_room' # rubocop:todo Gemfile/MissingFeatureCategory +@@ -557,7 +458,7 @@ gem 'grape_logging', '~> 1.8', feature_category: :api + gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfile/MissingFeatureCategory # Countries list --gem 'countries', '~> 4.0.0' -+gem 'countries', '~> 4.0' +-gem 'countries', '~> 4.0.0' # rubocop:todo Gemfile/MissingFeatureCategory ++gem 'countries', '~> 4.0' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'retriable', '~> 3.1.2' + gem 'retriable', '~> 3.1.2' # rubocop:todo Gemfile/MissingFeatureCategory -@@ -624,3 +521,9 @@ gem 'net-protocol', '~> 0.1.3' - gem 'net-http', '= 0.1.1' +@@ -623,6 +524,7 @@ gem 'app_store_connect' # rubocop:todo Gemfile/Missing + gem 'telesignenterprise', '~> 2.2' # rubocop:todo Gemfile/MissingFeatureCategory + + # BufferedIO patch ++ + # Updating this version will require updating scripts/allowed_warnings.txt + gem 'net-protocol', '~> 0.1.3' # rubocop:todo Gemfile/MissingFeatureCategory + # Lock this until we make DNS rebinding work with the updated net-http: +@@ -630,3 +532,9 @@ gem 'net-protocol', '~> 0.1.3' # rubocop:todo Gemfile/ + gem 'net-http', '= 0.1.1' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'duo_api', '~> 1.3' + gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory + +gem 'parser' +gem 'net-smtp' diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example index 137e75172c6f..02fa13f7f741 100644 --- a/www/gitlab-ce/files/patch-config_gitlab.yml.example +++ b/www/gitlab-ce/files/patch-config_gitlab.yml.example @@ -1,4 +1,4 @@ ---- config/gitlab.yml.example.orig 2023-08-21 09:25:45 UTC +--- config/gitlab.yml.example.orig 2023-10-20 08:41:39 UTC +++ config/gitlab.yml.example @@ -456,7 +456,7 @@ production: &base ## GitLab Pages @@ -22,7 +22,7 @@ # File that contains the shared secret key for verifying access for gitlab-pages. # Default is '.gitlab_pages_secret' relative to Rails.root (i.e. root of the GitLab app). -@@ -1192,14 +1192,14 @@ production: &base +@@ -1196,14 +1196,14 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: @@ -40,7 +40,7 @@ # archive_permissions: 0640 # Permissions for the resulting backup.tar file (default: 0600) # keep_time: 604800 # default: 0 (forever) (in seconds) # pg_schema: public # default: nil, it means that all schemas will be backed up -@@ -1234,12 +1234,12 @@ production: &base +@@ -1238,12 +1238,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -56,7 +56,7 @@ # Git over HTTP upload_pack: true -@@ -1254,13 +1254,13 @@ production: &base +@@ -1258,13 +1258,13 @@ production: &base workhorse: # File that contains the secret key for verifying access for gitlab-workhorse. # Default is '.gitlab_workhorse_secret' relative to Rails.root (i.e. root of the GitLab app). @@ -72,7 +72,7 @@ # The URL to the external KAS API (used by the Kubernetes agents) # external_url: wss://kas.example.com -@@ -1284,13 +1284,13 @@ production: &base +@@ -1288,13 +1288,13 @@ production: &base ## GitLab Elasticsearch settings elasticsearch: @@ -88,7 +88,7 @@ ## Webpack settings # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running -@@ -1311,18 +1311,18 @@ production: &base +@@ -1315,18 +1315,18 @@ production: &base # Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq. sidekiq_exporter: @@ -114,7 +114,7 @@ # Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma. web_exporter: -@@ -1547,13 +1547,13 @@ test: +@@ -1551,13 +1551,13 @@ test: gitaly_address: unix:tmp/tests/gitaly/praefect.socket gitaly: diff --git a/www/gitlab-ce/files/patch-config_puma.rb.example b/www/gitlab-ce/files/patch-config_puma.rb.example index fd303f352d69..ca75ff90f250 100644 --- a/www/gitlab-ce/files/patch-config_puma.rb.example +++ b/www/gitlab-ce/files/patch-config_puma.rb.example @@ -1,4 +1,4 @@ ---- config/puma.rb.example.orig 2023-06-21 08:07:20 UTC +--- config/puma.rb.example.orig 2023-10-20 08:41:39 UTC +++ config/puma.rb.example @@ -5,11 +5,11 @@ # The default is "config.ru". @@ -30,7 +30,7 @@ on_restart do # Signal application hooks that we're about to restart -@@ -74,7 +74,7 @@ worker_timeout 60 +@@ -74,14 +74,14 @@ worker_timeout 60 wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f # Use json formatter @@ -39,3 +39,11 @@ json_formatter = Gitlab::PumaLogging::JSONFormatter.new log_formatter do |str| + json_formatter.call(str) + end + +-require_relative "/home/git/gitlab/lib/gitlab/puma/error_handler" ++require_relative "%%PREFIX%%/www/gitlab-ce/lib/gitlab/puma/error_handler" + + error_handler = Gitlab::Puma::ErrorHandler.new(ENV['RAILS_ENV'] == 'production') + diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile index dd3e49257cbd..9e2d7062484a 100644 --- a/www/gitlab-pages/Makefile +++ b/www/gitlab-pages/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-pages -PORTVERSION= 16.4.1 +PORTVERSION= 16.5.0 DISTVERSIONPREFIX= v CATEGORIES= www MASTER_SITES+= https://gitlab.com/gitlab-org/gitlab-pages/-/raw/v${DISTVERSION}/ diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo index faa734153a59..4d1d5e49eae0 100644 --- a/www/gitlab-pages/distinfo +++ b/www/gitlab-pages/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1695965744 -SHA256 (go/www_gitlab-pages/gitlab-pages-v16.4.1/go.mod) = 7c187a27bbe120e94adb41fb30ee7e5e0a5432bbae20db191a5e1deec02fc920 -SIZE (go/www_gitlab-pages/gitlab-pages-v16.4.1/go.mod) = 2957 -SHA256 (go/www_gitlab-pages/gitlab-pages-v16.4.1/gitlab-pages-v16.4.1.tar.bz2) = 0e56bb34a0bdc6b49373362fc27189298d66e56d133e685f47cfd50f761dc6e7 -SIZE (go/www_gitlab-pages/gitlab-pages-v16.4.1/gitlab-pages-v16.4.1.tar.bz2) = 190359 +TIMESTAMP = 1698070007 +SHA256 (go/www_gitlab-pages/gitlab-pages-v16.5.0/go.mod) = 896ed13d735e4b95bdedd317e789dd6429222d38c651f1baae0bed413d5602a6 +SIZE (go/www_gitlab-pages/gitlab-pages-v16.5.0/go.mod) = 2931 +SHA256 (go/www_gitlab-pages/gitlab-pages-v16.5.0/gitlab-pages-v16.5.0.tar.bz2) = b0dccaf2648e9cf67da9bb0438d0f7186b1fc7231d78a8d9c62671e4c5ff279a +SIZE (go/www_gitlab-pages/gitlab-pages-v16.5.0/gitlab-pages-v16.5.0.tar.bz2) = 203573 diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile index 11ff675a7db7..383a108fad7b 100644 --- a/www/gitlab-workhorse/Makefile +++ b/www/gitlab-workhorse/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-workhorse -PORTVERSION= 16.4.1 +PORTVERSION= 16.5.0 DISTVERSIONPREFIX= v CATEGORIES= www diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index 8a31091dab04..bb99c94ea116 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1695965964 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.4.1/go.mod) = 6dbac21e68f49d022a392749e180c5297fee0f401dd9a96c86c8c1e1ae4165a1 -SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.4.1/go.mod) = 6691 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.4.1/gitlab-foss-v16.4.1.tar.bz2) = 1a408099b16bedfa4bbaa437bac75292c06d85fd6fe5ba80f3bc02d4515a83ae -SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.4.1/gitlab-foss-v16.4.1.tar.bz2) = 96987223 +TIMESTAMP = 1698065153 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.5.0/go.mod) = 98d1e08c1c106673b32c20697c616efeca50d2b698293aa282fd75be90e89b82 +SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.5.0/go.mod) = 6781 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.5.0/gitlab-foss-v16.5.0.tar.bz2) = 5b9091e9d815e102fd858d258cf65640a5774d34a5a79906b5f27e03ae235848 +SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.5.0/gitlab-foss-v16.5.0.tar.bz2) = 92735315