git: 9c84b9135992 - 2026Q3 - www/gitlab: major upgrade to 19.2.0
Matthias Fechner <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.ports |
|---|---|
| Message-ID | <[email protected]> |
The branch 2026Q3 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=9c84b913599272c2cc89e02591ee0b8eee94c60d commit 9c84b913599272c2cc89e02591ee0b8eee94c60d Author: Matthias Fechner <[email protected]> AuthorDate: 2026-07-17 12:51:36 +0000 Commit: Matthias Fechner <[email protected]> CommitDate: 2026-07-31 06:50:53 +0000 www/gitlab: major upgrade to 19.2.0 Changes: https://docs.gitlab.com/releases/19/gitlab-19-2-released/ (cherry picked from commit 59dbab9cc14c7dd3d0ee21ccfcb7d0ad5b708e65) --- devel/gitaly/Makefile | 3 +- devel/gitaly/distinfo | 24 +++++---- devel/gitlab-shell/Makefile | 3 +- devel/gitlab-shell/distinfo | 10 ++-- net/gitlab-agent/Makefile | 4 ++ net/gitlab-agent/distinfo | 10 ++-- net/rubygem-gitlab-kas-grpc/Makefile | 2 +- net/rubygem-gitlab-kas-grpc/distinfo | 6 +-- www/gitlab-pages/distinfo | 10 ++-- www/gitlab-workhorse/distinfo | 10 ++-- www/gitlab/Makefile | 67 +++++++++++++----------- www/gitlab/Makefile.common | 11 ++-- www/gitlab/distinfo | 12 ++--- www/gitlab/files/patch-Gemfile | 32 +++++------ www/gitlab/files/patch-config_application.rb | 6 +-- www/gitlab/files/patch-config_gitlab.yml.example | 20 +++---- www/gitlab/pkg-message | 4 +- 17 files changed, 123 insertions(+), 111 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index ff1679616b69..cc6c4b23d43f 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -32,7 +32,8 @@ USE_GITLAB= yes GL_ACCOUNT= gitlab-org GL_TUPLE= gitlab-org:git:v${GITLAB_GIT_VERSION}:git_dep/_build/deps/git-v${GITLAB_GIT_VERSION_SHORT} \ gitlab-org:git:${GITLAB_GIT_MASTER_VERSION}:git_master_dep/_build/deps/git-master \ - gitlab-org:git:${GITLAB_GIT_PREV_VERSION}:git_prev_dep/_build/deps/git-prev + gitlab-org:git:${GITLAB_GIT_PREV_VERSION}:git_prev_dep/_build/deps/git-prev \ + gitlab-org:git:${GITLAB_GIT_VERSION_MVCC}:git_mvcc_dep/_build/deps/git-mvcc GO_MOD_DIST= gitlab GO_MODULE= gitlab.com/gitlab-org/gitaly/v19 diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index a8df29244c30..6fbe398d3656 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,11 +1,13 @@ -TIMESTAMP = 1783575864 -SHA256 (go/devel_gitaly/gitaly-v19.1.2/go.mod) = 472e01180c0189da9b081f07b439cc9f59a2dcd20185b9b2659a2dd794885c60 -SIZE (go/devel_gitaly/gitaly-v19.1.2/go.mod) = 12274 -SHA256 (go/devel_gitaly/gitaly-v19.1.2/gitaly-v19.1.2.tar.bz2) = 8eaa8ddcece319b8bd913954a3ba9ad8f99edd2a2b8bc7868dd1570b4d7a8b18 -SIZE (go/devel_gitaly/gitaly-v19.1.2/gitaly-v19.1.2.tar.bz2) = 4753617 -SHA256 (go/devel_gitaly/gitaly-v19.1.2/git-v2.54.0.tar.bz2) = 0afe27f0b087c18613b7b6ddf2cae48d39ee808ca63e5496622845b180ff8595 -SIZE (go/devel_gitaly/gitaly-v19.1.2/git-v2.54.0.tar.bz2) = 9512039 -SHA256 (go/devel_gitaly/gitaly-v19.1.2/gitlab-org-git-25d6fff5946249d2ed0c71ec7605c3e81678f6cc_GL0.tar.gz) = e6fbfb0b4e234714c9aed94575acdbecc0576ec5fcc7374ffbc4b40adfc62544 -SIZE (go/devel_gitaly/gitaly-v19.1.2/gitlab-org-git-25d6fff5946249d2ed0c71ec7605c3e81678f6cc_GL0.tar.gz) = 12143914 -SHA256 (go/devel_gitaly/gitaly-v19.1.2/gitlab-org-git-b15384c06f77bc2d34d0d3623a8a58218313a561_GL0.tar.gz) = edad17ac5f10a37873aa5da1f7a556d7b81fa6b71ba623dbfed2b0c868ad8a92 -SIZE (go/devel_gitaly/gitaly-v19.1.2/gitlab-org-git-b15384c06f77bc2d34d0d3623a8a58218313a561_GL0.tar.gz) = 12072239 +TIMESTAMP = 1784186253 +SHA256 (go/devel_gitaly/gitaly-v19.2.0/go.mod) = 56a1ef945842438041076f6f839c3fbb877b579f000e78a50aefb87f9a741c7f +SIZE (go/devel_gitaly/gitaly-v19.2.0/go.mod) = 12348 +SHA256 (go/devel_gitaly/gitaly-v19.2.0/gitaly-v19.2.0.tar.bz2) = 08a9602143c348f552da2dea442525a3ea9f1f8f84ce4b780ed20f1379633cd7 +SIZE (go/devel_gitaly/gitaly-v19.2.0/gitaly-v19.2.0.tar.bz2) = 4789156 +SHA256 (go/devel_gitaly/gitaly-v19.2.0/git-v2.54.0.tar.bz2) = 0afe27f0b087c18613b7b6ddf2cae48d39ee808ca63e5496622845b180ff8595 +SIZE (go/devel_gitaly/gitaly-v19.2.0/git-v2.54.0.tar.bz2) = 9512039 +SHA256 (go/devel_gitaly/gitaly-v19.2.0/gitlab-org-git-1ea786d14a1bb47399ce7b5f1e5885d65139b35f_GL0.tar.gz) = 5486c260dd1063d4b346e1717d1e1249463c58a79c9e283daba5b6c3b52f243b +SIZE (go/devel_gitaly/gitaly-v19.2.0/gitlab-org-git-1ea786d14a1bb47399ce7b5f1e5885d65139b35f_GL0.tar.gz) = 12170085 +SHA256 (go/devel_gitaly/gitaly-v19.2.0/gitlab-org-git-02bb39c5cbca65a4817854477cc3e1c31ea28c49_GL0.tar.gz) = f6f9d74ab9f4f290a28fb131c2b44f664bb7b0476c3ad6cbad3a8b73fe48995b +SIZE (go/devel_gitaly/gitaly-v19.2.0/gitlab-org-git-02bb39c5cbca65a4817854477cc3e1c31ea28c49_GL0.tar.gz) = 12168183 +SHA256 (go/devel_gitaly/gitaly-v19.2.0/gitlab-org-git-259367dc2d128a4e0dc4b6d0f67ee9711bde8cc2_GL0.tar.gz) = 79a206d2b174839b368c35068ac3bfa4a7e5d4d17617b3046e8ea6df47ff3165 +SIZE (go/devel_gitaly/gitaly-v19.2.0/gitlab-org-git-259367dc2d128a4e0dc4b6d0f67ee9711bde8cc2_GL0.tar.gz) = 12193033 diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile index 9a102643aeb2..c0f52245292c 100644 --- a/devel/gitlab-shell/Makefile +++ b/devel/gitlab-shell/Makefile @@ -1,6 +1,5 @@ PORTNAME= gitlab-shell -PORTVERSION= 14.54.0 -PORTREVISION= 1 +PORTVERSION= 14.56.1 DISTVERSIONPREFIX= v CATEGORIES= devel diff --git a/devel/gitlab-shell/distinfo b/devel/gitlab-shell/distinfo index 2cf72d37b313..35e8c5bc4a7a 100644 --- a/devel/gitlab-shell/distinfo +++ b/devel/gitlab-shell/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1781693848 -SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.54.0/go.mod) = 1f37d0c9c9de5dcc9ff01e8f2e3c0f21a540c662f265f4213e7298987705168f -SIZE (go/devel_gitlab-shell/gitlab-shell-v14.54.0/go.mod) = 9545 -SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.54.0/gitlab-shell-v14.54.0.tar.bz2) = d8aa348cbb6aa42f8e1485a495d44d7c70ab4581fa24dac3e79c303e7497fb09 -SIZE (go/devel_gitlab-shell/gitlab-shell-v14.54.0/gitlab-shell-v14.54.0.tar.bz2) = 205854 +TIMESTAMP = 1784177944 +SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.56.1/go.mod) = a1d3f514fe7cc2eeca7bf357706353c91ac2c2d4d86623754486ed384b79da65 +SIZE (go/devel_gitlab-shell/gitlab-shell-v14.56.1/go.mod) = 9545 +SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.56.1/gitlab-shell-v14.56.1.tar.bz2) = 286f2cc569ac81d71abc8110c4c949a4451f30ec4d5bf4d45116e1f30850e41a +SIZE (go/devel_gitlab-shell/gitlab-shell-v14.56.1/gitlab-shell-v14.56.1.tar.bz2) = 219695 diff --git a/net/gitlab-agent/Makefile b/net/gitlab-agent/Makefile index 3b12fa40836b..9ea9f69a2d6b 100644 --- a/net/gitlab-agent/Makefile +++ b/net/gitlab-agent/Makefile @@ -15,6 +15,10 @@ BUILD_DEPENDS= git>=0:devel/git \ golangci-lint>=0:devel/golangci-lint USES= go:modules +USE_GITLAB= yes +GL_ACCOUNT= gitlab-org/cluster-integration +# this branch removes the replace line in go.mod which breaks the way FreeBSD ports build go packages +GO_MOD_DIST= https://gitlab.com/mfechner/gitlab-agent/-/raw/19-2-stable/ GO_MODULE= gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v19 _BUILD_DATE= $$(date -u "+%Y-%m-%d-%H%M UTC") diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo index 314e17df163f..62cb39f0f6c8 100644 --- a/net/gitlab-agent/distinfo +++ b/net/gitlab-agent/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1783575865 -SHA256 (go/net_gitlab-agent/gitlab-agent-v19.1.2/v19.1.2.mod) = 445ca92867f678fae58e4084b32b4fa20fc9c7bcac231611ee7a1c01a777fe56 -SIZE (go/net_gitlab-agent/gitlab-agent-v19.1.2/v19.1.2.mod) = 9597 -SHA256 (go/net_gitlab-agent/gitlab-agent-v19.1.2/v19.1.2.zip) = e24e324f51181750f00de6ac443fd20967418f8b6038d0af648105be455a1aee -SIZE (go/net_gitlab-agent/gitlab-agent-v19.1.2/v19.1.2.zip) = 2539309 +TIMESTAMP = 1784192284 +SHA256 (go/net_gitlab-agent/gitlab-agent-v19.2.0/go.mod) = 4ca569323c145a24af3b478c95f01f32d24efb6e07c899fc5f450bc4413ca2d9 +SIZE (go/net_gitlab-agent/gitlab-agent-v19.2.0/go.mod) = 10183 +SHA256 (go/net_gitlab-agent/gitlab-agent-v19.2.0/gitlab-agent-v19.2.0.tar.bz2) = 0c65434861b6136ed3bec4e4f41f5a8dd1bf6fc497fe082290c58dadad464630 +SIZE (go/net_gitlab-agent/gitlab-agent-v19.2.0/gitlab-agent-v19.2.0.tar.bz2) = 1320189 diff --git a/net/rubygem-gitlab-kas-grpc/Makefile b/net/rubygem-gitlab-kas-grpc/Makefile index e0ab3e64de0d..f448ba48f7e2 100644 --- a/net/rubygem-gitlab-kas-grpc/Makefile +++ b/net/rubygem-gitlab-kas-grpc/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-kas-grpc -PORTVERSION= ${GITLAB_KAS_GRPC_VERSION} +DISTVERSION= ${GITLAB_KAS_GRPC_VERSION} PORTREVISION= ${GITLAB_PORTREVISION} # modify it in www/gitlab/Makefile.common CATEGORIES= net rubygems MASTER_SITES= RG diff --git a/net/rubygem-gitlab-kas-grpc/distinfo b/net/rubygem-gitlab-kas-grpc/distinfo index ae8bd985b957..c30aae2e7154 100644 --- a/net/rubygem-gitlab-kas-grpc/distinfo +++ b/net/rubygem-gitlab-kas-grpc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1783575881 -SHA256 (rubygem/gitlab-kas-grpc-19.1.2.gem) = c03fae26b7ac448e4ed67e41d1168251f9ef21cdc120d815999b7b3187034b4c -SIZE (rubygem/gitlab-kas-grpc-19.1.2.gem) = 12800 +TIMESTAMP = 1784285767 +SHA256 (rubygem/gitlab-kas-grpc-19.2.0.pre.rc1.gem) = cb744b3a3e071f5e3151dfd85fce2ba7c28b043e95e8826b0ed2b546180d83ea +SIZE (rubygem/gitlab-kas-grpc-19.2.0.pre.rc1.gem) = 13824 diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo index d5e6cb2f31eb..7a539abb7d94 100644 --- a/www/gitlab-pages/distinfo +++ b/www/gitlab-pages/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1783575867 -SHA256 (go/www_gitlab-pages/gitlab-pages-v19.1.2/go.mod) = e3623e5c4b9c16f07be95e90fb28e3f3dde541279e817291b7c63ad8a6a65c61 -SIZE (go/www_gitlab-pages/gitlab-pages-v19.1.2/go.mod) = 4049 -SHA256 (go/www_gitlab-pages/gitlab-pages-v19.1.2/gitlab-pages-v19.1.2.tar.bz2) = 34714d8f6430c2268cfda5a4fe003c324a44980c959742fd4992bdd2f0809abc -SIZE (go/www_gitlab-pages/gitlab-pages-v19.1.2/gitlab-pages-v19.1.2.tar.bz2) = 242735 +TIMESTAMP = 1784177852 +SHA256 (go/www_gitlab-pages/gitlab-pages-v19.2.0/go.mod) = ac6ec203774f56da7be300a587418c6b260708c05ae8b6c5bea5da6451ecf1c3 +SIZE (go/www_gitlab-pages/gitlab-pages-v19.2.0/go.mod) = 4049 +SHA256 (go/www_gitlab-pages/gitlab-pages-v19.2.0/gitlab-pages-v19.2.0.tar.bz2) = 37e17496f76cdb09454e3d76b0f876ed9e1dc40105f2fe7aaecd91c4cf312664 +SIZE (go/www_gitlab-pages/gitlab-pages-v19.2.0/gitlab-pages-v19.2.0.tar.bz2) = 243313 diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index 1e2297012035..962e78a697ea 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1783575881 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v19.1.2/go.mod) = 39b3ebee5493a35e6c7be864329941434857299aadf0da3bd70e610aa38d6f15 -SIZE (go/www_gitlab-workhorse/gitlab-foss-v19.1.2/go.mod) = 12932 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v19.1.2/gitlab-foss-v19.1.2.tar.bz2) = 5883870d718ffe1818af27383a63cd44dd80e3a2715358464f3f376de2cd77aa -SIZE (go/www_gitlab-workhorse/gitlab-foss-v19.1.2/gitlab-foss-v19.1.2.tar.bz2) = 137987010 +TIMESTAMP = 1784177870 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v19.2.0/go.mod) = 823364d23b65e6552e1e26b9d896dfd1e230547f4c9a79d39f96a26f2b7a093b +SIZE (go/www_gitlab-workhorse/gitlab-foss-v19.2.0/go.mod) = 12930 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v19.2.0/gitlab-foss-v19.2.0.tar.bz2) = 7103b76da18f999591028e98e6cc25de816abe747fc2f7d5837efad4bd19dd10 +SIZE (go/www_gitlab-workhorse/gitlab-foss-v19.2.0/gitlab-foss-v19.2.0.tar.bz2) = 139987771 diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 2bffda8b47d5..208107e32218 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -33,7 +33,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ gitlab-elasticsearch-indexer>=5.14.7:textproc/gitlab-elasticsearch-indexer \ gitlab-agent>=${GITLAB_VERSION}:net/gitlab-agent \ gitlab-pages>=${GITLAB_VERSION}:www/gitlab-pages \ - gitlab-shell>=14.54.0:devel/gitlab-shell \ + gitlab-shell>=14.56.1:devel/gitlab-shell \ gitlab-workhorse>=${GITLAB_VERSION}:www/gitlab-workhorse \ gitlab-zoekt-indexer>=1.16.1:textproc/gitlab-zoekt-indexer \ redis>=7.2:databases/redis \ @@ -49,20 +49,20 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-drb-gitlab>=2.2.3<3:devel/rubygem-drb-gitlab \ rubygem-bootsnap-gitlab>=1.24.6<1.25:devel/rubygem-bootsnap-gitlab \ rubygem-ffi>=1.17.4<2:devel/rubygem-ffi \ - rubygem-openssl3>=3.3.2<3.4:security/rubygem-openssl3 \ - rubygem-gitlab-secret_detection>=0.42.0<1:security/rubygem-gitlab-secret_detection \ + rubygem-openssl3>=3.3.3<3.4:security/rubygem-openssl3 \ + rubygem-gitlab-secret_detection>=0.42.1<1:security/rubygem-gitlab-secret_detection \ rubygem-responders-rails-gitlab>=3.0<4.0:www/rubygem-responders-rails-gitlab \ rubygem-sprockets-gitlab>=3.7.5<3.8:devel/rubygem-sprockets-gitlab \ rubygem-sprockets-rails-rails-gitlab>=3.5.2<3.6:devel/rubygem-sprockets-rails-rails-gitlab \ rubygem-view_component-rails-gitlab>=3.23.2<3.24:devel/rubygem-view_component-rails-gitlab \ rubygem-pg-gitlab>=1.6.3<1.7:databases/rubygem-pg-gitlab \ - rubygem-faraday-gitlab>=2.14.2<3:www/rubygem-faraday-gitlab \ - rubygem-faraday-retry-gitlab>=2<3:www/rubygem-faraday-retry-gitlab \ + rubygem-faraday-gitlab>=2.14.3<3:www/rubygem-faraday-gitlab \ + rubygem-faraday-retry-gitlab>=2.4.0<3:www/rubygem-faraday-retry-gitlab \ rubygem-logger-gitlab>=1.7.0<1.8:devel/rubygem-logger-gitlab \ rubygem-marginalia>=1.11.1<1.12:databases/rubygem-marginalia \ rubygem-declarative_policy>=2.1.0<2.2:security/rubygem-declarative_policy \ rubygem-gitlab-glaz>=0.0.3<0.1:security/rubygem-gitlab-glaz \ - rubygem-coverband>=6.2.0<6.3:www/rubygem-coverband \ + rubygem-coverband>=6.2.1<6.3:www/rubygem-coverband \ rubygem-devise-rails-gitlab>=4.9.3<4.10:devel/rubygem-devise-rails-gitlab \ rubygem-bcrypt>=3.1.22<3.2:security/rubygem-bcrypt \ rubygem-doorkeeper-rails-gitlab>=5.9.0<6:security/rubygem-doorkeeper-rails-gitlab \ @@ -73,7 +73,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-omniauth-saml-gitlab>=2.2.5<3:security/rubygem-omniauth-saml-gitlab \ rubygem-omniauth-gl>=2.1.3<3:security/rubygem-omniauth-gl \ rubygem-omniauth-auth0-gitlab>=3.1.1<3.2.0:net/rubygem-omniauth-auth0-gitlab \ - rubygem-omniauth-azure-activedirectory-v2>=2.0<3:net/rubygem-omniauth-azure-activedirectory-v2 \ + rubygem-omniauth-azure-activedirectory-v2>=2.4<3:net/rubygem-omniauth-azure-activedirectory-v2 \ rubygem-omniauth-alicloud>=3.0.0<3.1:security/rubygem-omniauth-alicloud \ rubygem-omniauth-github-gitlab>=2.0.1<2.1:net/rubygem-omniauth-github-gitlab \ rubygem-omniauth-google-oauth2-gitlab>=1.2.2<2:net/rubygem-omniauth-google-oauth2-gitlab \ @@ -94,18 +94,18 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-attr_encrypted>=4.2<5:security/rubygem-attr_encrypted \ rubygem-validates_hostname-gitlab>=1.0.13<1.1.0:dns/rubygem-validates_hostname-gitlab \ rubygem-rubyzip-gitlab>=2.4.1<2.5:archivers/rubygem-rubyzip-gitlab \ - rubygem-acme-client-gitlab>=2.0.31<3:security/rubygem-acme-client-gitlab \ + rubygem-acme-client-gitlab>=2.0.32<3:security/rubygem-acme-client-gitlab \ rubygem-browser5>=5.3.1<5.4:www/rubygem-browser5 \ - rubygem-ohai>=19.1.24<19.2:sysutils/rubygem-ohai \ + rubygem-ohai>=19.1.40<19.2:sysutils/rubygem-ohai \ rubygem-gpgme>=2.0.26<2.1.0:security/rubygem-gpgme \ rubygem-gitlab_omniauth-ldap-gitlab>=2.3.0<2.4.0:net/rubygem-gitlab_omniauth-ldap-gitlab \ rubygem-net-ldap>=0.20.0<0.21:net/rubygem-net-ldap \ rubygem-grape20>=2.0.0<2.1:devel/rubygem-grape20 \ - rubygem-grape-entity>=1.0.1<1.1,1:devel/rubygem-grape-entity \ + rubygem-grape-entity>=1.1.0<1.2,1:devel/rubygem-grape-entity \ rubygem-grape-swagger-gitlab>=2.1.2<2.2:devel/rubygem-grape-swagger-gitlab \ rubygem-grape-swagger-entity>=0.7.1<0.8:devel/rubygem-grape-swagger-entity \ rubygem-grape-path-helpers>=2.0.1<2.1:devel/rubygem-grape-path-helpers \ - rubygem-gitlab-grape-openapi>=0.1<1:devel/rubygem-gitlab-grape-openapi \ + rubygem-gitlab-grape-openapi>=0.2.1<1:devel/rubygem-gitlab-grape-openapi \ rubygem-rack-cors>=2.0.1<2.1:www/rubygem-rack-cors \ rubygem-graphql>=2.6.3<2.6.4:devel/rubygem-graphql \ rubygem-apollo_upload_server>=2.1.8<2.2:net/rubygem-apollo_upload_server \ @@ -143,14 +143,14 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-elasticsearch-model-gitlab>=7.2<8:textproc/rubygem-elasticsearch-model-gitlab \ rubygem-elasticsearch-rails7>=7.2<8:textproc/rubygem-elasticsearch-rails7 \ rubygem-elasticsearch-api-gitlab>=7.17.11<7.18:textproc/rubygem-elasticsearch-api-gitlab \ - rubygem-aws-sdk-core-gitlab>=3.250.0<3.251:devel/rubygem-aws-sdk-core-gitlab \ + rubygem-aws-sdk-core-gitlab>=3.252.0<3.253:devel/rubygem-aws-sdk-core-gitlab \ rubygem-aws-sdk-cloudformation-gitlab>=1.154<2:devel/rubygem-aws-sdk-cloudformation-gitlab \ - rubygem-aws-sdk-s3-gitlab>=1.224.0<1.225:devel/rubygem-aws-sdk-s3-gitlab \ + rubygem-aws-sdk-s3-gitlab>=1.226.0<1.227:devel/rubygem-aws-sdk-s3-gitlab \ rubygem-faraday-typhoeus-gitlab>=1.1<2:www/rubygem-faraday-typhoeus-gitlab \ rubygem-faraday_middleware-aws-sigv4-gitlab>=1.0.1<1.1:devel/rubygem-faraday_middleware-aws-sigv4-gitlab \ rubygem-typhoeus-gitlab>=1.4.0<1.5:www/rubygem-typhoeus-gitlab \ rubygem-html-pipeline-gitlab>=2.14.3<2.15:textproc/rubygem-html-pipeline-gitlab \ - rubygem-gitlab-markup>=2.0.0<2.1:textproc/rubygem-gitlab-markup \ + rubygem-gitlab-markup>=2.1.0<2.2:textproc/rubygem-gitlab-markup \ rubygem-commonmarker0>=0.23.12<0.24:textproc/rubygem-commonmarker0 \ rubygem-kramdown-gitlab>=2.5.2<2.6:textproc/rubygem-kramdown-gitlab \ rubygem-redcloth>=4.3.3<4.4.0:www/rubygem-redcloth \ @@ -171,7 +171,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-diffy>=3.4.4<4:textproc/rubygem-diffy \ rubygem-rack-gitlab>=2.2.23<2.3:www/rubygem-rack-gitlab \ rubygem-rack-timeout>=0.7.0<0.8:www/rubygem-rack-timeout \ - rubygem-puma-gitlab>=8.0<9:www/rubygem-puma-gitlab \ + rubygem-puma-gitlab>=8.0.2<9:www/rubygem-puma-gitlab \ rubygem-sd_notify>=0.1.1<0.2:devel/rubygem-sd_notify \ rubygem-state_machines-activerecord-gitlab>=0.100.0<0.101.0:databases/rubygem-state_machines-activerecord-gitlab \ rubygem-sidekiq-gitlab>=7.3.9:devel/rubygem-sidekiq-gitlab \ @@ -187,11 +187,11 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-device_detector>=1.1.3:devel/rubygem-device_detector \ rubygem-redis-gitlab>=5.4.1<5.5:databases/rubygem-redis-gitlab \ rubygem-redis-client>=0.29.0<1:databases/rubygem-redis-client \ - rubygem-redis-cluster-client>=0.15.0<1:databases/rubygem-redis-cluster-client \ + rubygem-redis-cluster-client>=0.16.5<1:databases/rubygem-redis-cluster-client \ rubygem-redis-clustering-gitlab>=5.4.1<5.5:databases/rubygem-redis-clustering-gitlab \ rubygem-connection_pool-gitlab>=2.5.5<2.6:net/rubygem-connection_pool-gitlab \ rubygem-redis-actionpack-rails-gitlab>=5.5.0<5.6:databases/rubygem-redis-actionpack-rails-gitlab \ - rubygem-jira-ruby-gitlab>=2.3.0<2.4:devel/rubygem-jira-ruby-gitlab \ + rubygem-jira-ruby-gitlab>=3.2.0<3.3:devel/rubygem-jira-ruby-gitlab \ rubygem-atlassian-jwt>=0.2.1<0.3.0:www/rubygem-atlassian-jwt \ rubygem-slack-messenger>=2.3.5<2.4.0:devel/rubygem-slack-messenger \ rubygem-kubeclient>=4.12.0<4.13.0:www/rubygem-kubeclient \ @@ -209,7 +209,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-rack-proxy-gitlab>=0.7.7<0.8.0:www/rubygem-rack-proxy-gitlab \ rubygem-cssbundling-rails-rails-gitlab>=1.4.3<1.5:www/rubygem-cssbundling-rails-rails-gitlab \ rubygem-terser>=1.0.2<1.0.3:textproc/rubygem-terser \ - rubygem-click_house-client>=0.10.0<0.11:databases/rubygem-click_house-client \ + rubygem-click_house-client>=0.11.0<0.12:databases/rubygem-click_house-client \ rubygem-addressable>=2.8<3:www/rubygem-addressable \ rubygem-gon-rails-gitlab>=6.5.0<6.6:www/rubygem-gon-rails-gitlab \ rubygem-request_store>=1.7.0<1.8:devel/rubygem-request_store \ @@ -221,7 +221,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-sentry-sidekiq>=5.23.0<5.24:devel/rubygem-sentry-sidekiq \ rubygem-pg_query>=6.2.2<6.3:databases/rubygem-pg_query \ rubygem-premailer-rails-rails-gitlab>=1.12.0<1.13:mail/rubygem-premailer-rails-rails-gitlab \ - rubygem-gitlab-labkit>=2.6.0<2.7:devel/rubygem-gitlab-labkit \ + rubygem-gitlab-labkit>=2.7.0<2.8:devel/rubygem-gitlab-labkit \ rubygem-thrift>=0.22.0,1<0.23,1:devel/rubygem-thrift \ rubygem-rails-i18n-rails-gitlab>=7.0.9<8:devel/rubygem-rails-i18n-rails-gitlab \ rubygem-gettext_i18n_rails>=1.13.0<1.14:devel/rubygem-gettext_i18n_rails \ @@ -231,9 +231,9 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-peek-rails-gitlab>=1.1<2.0:devel/rubygem-peek-rails-gitlab \ rubygem-snowplow-tracker>=0.8.0<1:devel/rubygem-snowplow-tracker \ rubygem-webrick>=1.9.0<1.10:www/rubygem-webrick \ - rubygem-prometheus-client-mmap>=1.5.0<1.6:devel/rubygem-prometheus-client-mmap \ + rubygem-prometheus-client-mmap>=1.6.0<1.7:devel/rubygem-prometheus-client-mmap \ rubygem-async-gitlab>=2.39.0<2.40:devel/rubygem-async-gitlab \ - rubygem-io-event-gitlab>=1.14.5<2:devel/rubygem-io-event-gitlab \ + rubygem-io-event-gitlab>=1.16.2<2:devel/rubygem-io-event-gitlab \ rubygem-gitlab-security_report_schemas>=0.2.0.min15.0.0.max15.2.4<0.2.0.min15.0.0.max15.2.5:devel/rubygem-gitlab-security_report_schemas \ rubygem-vite_rails-gitlab>=3.10.0<3.11:devel/rubygem-vite_rails-gitlab \ rubygem-vite_ruby-gitlab>=3.10.1<3.11:devel/rubygem-vite_ruby-gitlab \ @@ -263,17 +263,17 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-opentelemetry-instrumentation-sidekiq-gitlab>=0.28.1:devel/rubygem-opentelemetry-instrumentation-sidekiq-gitlab \ rubygem-warning>=1.5.0<1.6:devel/rubygem-warning \ rubygem-git>=1.19.1<2:devel/rubygem-git \ - rubygem-gitlab-dangerfiles>=4.11.1<4.12:devel/rubygem-gitlab-dangerfiles \ + rubygem-gitlab-dangerfiles>=4.12.0<4.13:devel/rubygem-gitlab-dangerfiles \ rubygem-rspec>=3.0<4:devel/rubygem-rspec \ rubygem-octokit-gitlab>=9.0<10:net/rubygem-octokit-gitlab \ - rubygem-faraday-multipart>=1.1.1<2:www/rubygem-faraday-multipart \ - rubygem-gitlab-mail_room>=1.0.0<1.1.0:mail/rubygem-gitlab-mail_room \ + rubygem-faraday-multipart>=1.2.0<2:www/rubygem-faraday-multipart \ + rubygem-gitlab-mail_room>=1.1.0<1.2.0:mail/rubygem-gitlab-mail_room \ rubygem-email_reply_trimmer>=0.1<1.0:mail/rubygem-email_reply_trimmer \ rubygem-html2text>=0.4.0:textproc/rubygem-html2text \ rubygem-stackprof>=0.2.28<0.3:devel/rubygem-stackprof \ rubygem-rbtrace>=0.5.3<1.0:devel/rubygem-rbtrace \ rubygem-memory_profiler>=1.1.0<2.0:devel/rubygem-memory_profiler \ - rubygem-oauth2-gitlab>=2.0.20<3:net/rubygem-oauth2-gitlab \ + rubygem-oauth2-gitlab>=2.0.24<3:net/rubygem-oauth2-gitlab \ rubygem-health_check-rails-gitlab>=3.0<4:devel/rubygem-health_check-rails-gitlab \ rubygem-vmstat>=2.3.1<2.4.0:sysutils/rubygem-vmstat \ rubygem-sys-filesystem-gitlab>=1.5.5<1.6:sysutils/rubygem-sys-filesystem-gitlab \ @@ -282,7 +282,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-spamcheck>=1.3.3<1.4:net/rubygem-spamcheck \ rubygem-gitaly>=19.0<20:net/rubygem-gitaly \ rubygem-gitlab-kas-grpc>=${GITLAB_KAS_GRPC_VERSION}:net/rubygem-gitlab-kas-grpc \ - rubygem-gitlab-gkg-proto>=0.37.0<0.38:net/rubygem-gitlab-gkg-proto \ + rubygem-gitlab-gkg-proto>=0.87.0<0.88:net/rubygem-gitlab-gkg-proto \ rubygem-grpc-gitlab>=1.81.0<1.82:net/rubygem-grpc-gitlab \ rubygem-google-protobuf>=4.35.0<5:devel/rubygem-google-protobuf \ rubygem-toml-rb>=4.1<5:www/rubygem-toml-rb \ @@ -290,7 +290,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-flipper-active_record-rails-gitlab>=1.3.6<1.4:databases/rubygem-flipper-active_record-rails-gitlab \ rubygem-flipper-active_support_cache_store-rails-gitlab>=1.3.6<1.4:devel/rubygem-flipper-active_support_cache_store-rails-gitlab \ rubygem-unleash>=3.2.2<3.3:devel/rubygem-unleash \ - rubygem-gitlab-experiment>=1.5.0<1.6:devel/rubygem-gitlab-experiment \ + rubygem-gitlab-experiment>=1.6.0<1.7:devel/rubygem-gitlab-experiment \ rubygem-lograge-rails-gitlab>=0.11.2<1.0:www/rubygem-lograge-rails-gitlab \ rubygem-grape_logging-gitlab>=1.8.4<2.0:devel/rubygem-grape_logging-gitlab \ rubygem-gitlab-net-dns>=0.15.0<0.16:dns/rubygem-gitlab-net-dns \ @@ -298,6 +298,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-retriable-gitlab>=3.1.2<3.2.0:devel/rubygem-retriable-gitlab \ rubygem-lru_redux>0:devel/rubygem-lru_redux \ rubygem-mail-gitlab>=2.9.0<2.9.1:mail/rubygem-mail-gitlab \ + rubygem-aws-actionmailer-ses-gitlab>=1.2.0<2:mail/rubygem-aws-actionmailer-ses-gitlab \ rubygem-lockbox>=1.4.1<1.5:security/rubygem-lockbox \ rubygem-valid_email>=0.1<1:mail/rubygem-valid_email \ rubygem-jsonb_accessor>=1.4<2:www/rubygem-jsonb_accessor \ @@ -314,7 +315,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-cvss-suite>=4.1.2<4.2:security/rubygem-cvss-suite \ rubygem-zstd-ruby-gitlab>=2.0.6<3:devel/rubygem-zstd-ruby-gitlab \ rubygem-arr-pm>=0.0.12<0.1:devel/rubygem-arr-pm \ - rubygem-devfile>=0.5.2<0.6:net/rubygem-devfile \ + rubygem-devfile>=0.5.3<0.6:net/rubygem-devfile \ rubygem-hashdiff>=1.2.1<1.3:devel/rubygem-hashdiff \ rubygem-CFPropertyList-gitlab>=3.0.7<3.1:devel/rubygem-CFPropertyList-gitlab \ rubygem-app_store_connect>=0:net/rubygem-app_store_connect \ @@ -322,22 +323,23 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-base6402>=0.2.0<0.3:converters/rubygem-base6402 \ rubygem-net-protocol>=0.2.2<0.3:net/rubygem-net-protocol \ rubygem-nkf-gitlab>=0.2.0<0.3:net/rubygem-nkf-gitlab \ + rubygem-resolv-replace>=0.2.0<0.3:dns/rubygem-resolv-replace \ rubygem-net-http-gitlab>=0.6.0<0.6.1:www/rubygem-net-http-gitlab \ rubygem-uri-gitlab>=1.1.1<1.2:net/rubygem-uri-gitlab \ rubygem-duo_api>=1.4<2:security/rubygem-duo_api \ rubygem-gitlab-sdk>=0.3.0<0.4:devel/rubygem-gitlab-sdk \ rubygem-paper_trail>=16.0<17:devel/rubygem-paper_trail \ rubygem-i18n_data>=0.13.1<1:devel/rubygem-i18n_data \ - rubygem-gitlab-cloud-connector>=1.51<2:security/rubygem-gitlab-cloud-connector \ + rubygem-gitlab-cloud-connector>=1.52<2:security/rubygem-gitlab-cloud-connector \ rubygem-gvltools>=0.4.0<0.5:devel/rubygem-gvltools \ - rubygem-gitlab_query_language>=0.28.0<0.29:devel/rubygem-gitlab_query_language \ + rubygem-gitlab_query_language>=0.29.0<0.30:devel/rubygem-gitlab_query_language \ rubygem-zlib>=3.2.3<3.3:devel/rubygem-zlib \ rubygem-license_finder-gitlab>=7.2.1<8:devel/rubygem-license_finder-gitlab \ rubygem-google-cloud-profiler-v2>=0.3<1:textproc/rubygem-google-cloud-profiler-v2 \ rubygem-parallel>=1.27.0<2:sysutils/rubygem-parallel \ rubygem-google-cloud-storage_transfer-gitlab>=1.2.0<1.3:net/rubygem-google-cloud-storage_transfer-gitlab \ rubygem-minitest>=5.11<6:devel/rubygem-minitest \ - rubygem-grpc-tools>=1.80.0<1.81:net/rubygem-grpc-tools \ + rubygem-grpc-tools>=1.81.0<1.82:net/rubygem-grpc-tools \ rubygem-opensearch-ruby-gitlab>=0:textproc/rubygem-opensearch-ruby-gitlab \ rubygem-bigdecimal-gitlab>=3.3.1<4:math/rubygem-bigdecimal-gitlab \ rubygem-freezolite>=0.6<1:devel/rubygem-freezolite @@ -368,6 +370,7 @@ SHEBANG_FILES= gems/bundler-checksum/test/project_with_checksum_lock/scripts/tes scripts/build_assets_image \ scripts/build_qa_image \ scripts/build_gdk_image \ + scripts/build_siphon_tables_image \ scripts/compile_assets \ scripts/db_tasks \ scripts/rails-update-bisect \ @@ -522,6 +525,7 @@ post-install: @${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/contracts/consumer/external" >> ${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(,,755) ${WWWDIR_REL}/shared" >> ${TMPPLIST} @@ -558,6 +562,7 @@ post-install: @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/workhorse/changelogs/unreleased" >> ${TMPPLIST} .if ${FLAVOR:U} == ee # Gitlab-ee version + @${ECHO_CMD} "@dir(,,755) ${WWWDIR_REL}/ee/spec/contracts/consumer/external" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,755) ${WWWDIR_REL}/qa/qa/specs/features/ee/api/4_verify" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,755) ${WWWDIR_REL}/qa/qa/specs/features/ee/api/5_package" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,755) ${WWWDIR_REL}/qa/qa/specs/features/ee/api/8_monitor" >> ${TMPPLIST} diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index 7f6a6b74486e..3addb0917059 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,4 +1,4 @@ -GITLAB_VERSION= 19.1.2 +GITLAB_VERSION= 19.2.0 GITLAB_PORTREVISION= 0 # decrease this only if GITLAB_KAS_GRPC_VERSION is upgraded # Git version gitaly should use (from gitlab mirror) @@ -7,12 +7,13 @@ GITLAB_PORTREVISION= 0 # decrease this only if GITLAB_KAS_GRPC_VERSION is upgrad GITLAB_GIT_VERSION= 2.54.0 # return something like x.yy GITLAB_GIT_VERSION_SHORT= ${GITLAB_GIT_VERSION:C/^([0-9]*\.[0-9]*)\..*/\1/} -GITLAB_GIT_MASTER_VERSION= 25d6fff5946249d2ed0c71ec7605c3e81678f6cc -GITLAB_GIT_PREV_VERSION= b15384c06f77bc2d34d0d3623a8a58218313a561 +GITLAB_GIT_MASTER_VERSION= 1ea786d14a1bb47399ce7b5f1e5885d65139b35f +GITLAB_GIT_PREV_VERSION= 02bb39c5cbca65a4817854477cc3e1c31ea28c49 +GITLAB_GIT_VERSION_MVCC= 259367dc2d128a4e0dc4b6d0f67ee9711bde8cc2 # Overwrite version for gitlab-kas-grpc -GITLAB_KAS_GRPC_VERSION= ${GITLAB_VERSION} -#GITLAB_KAS_GRPC_VERSION= 19.1.0 +#GITLAB_KAS_GRPC_VERSION= ${GITLAB_VERSION} +GITLAB_KAS_GRPC_VERSION= 19.2.0.pre.rc1 # Rails version RAILS_VERSION= 7.2.3.1 diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo index d55bee9f2a11..c7ed84ee5313 100644 --- a/www/gitlab/distinfo +++ b/www/gitlab/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1783575856 -SHA256 (gitlab-foss-v19.1.2.tar.bz2) = 5883870d718ffe1818af27383a63cd44dd80e3a2715358464f3f376de2cd77aa -SIZE (gitlab-foss-v19.1.2.tar.bz2) = 137987010 -TIMESTAMP = 1783575856 -SHA256 (gitlab-v19.1.2-ee.tar.bz2) = e154119bf0c494103284890edb43471ca0f51a11cc202ab0b92cd946c1ca1bd2 -SIZE (gitlab-v19.1.2-ee.tar.bz2) = 157736478 +TIMESTAMP = 1784285764 +SHA256 (gitlab-foss-v19.2.0.tar.bz2) = 7103b76da18f999591028e98e6cc25de816abe747fc2f7d5837efad4bd19dd10 +SIZE (gitlab-foss-v19.2.0.tar.bz2) = 139987771 +TIMESTAMP = 1784285765 +SHA256 (gitlab-v19.2.0-ee.tar.bz2) = 2acb2e0a37aaf7945df667edba8671741a30f36e89c214d87c0078fcea19abe1 +SIZE (gitlab-v19.2.0-ee.tar.bz2) = 162801343 diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index 1dd7194ce844..465cbbc5d632 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,6 +1,6 @@ ---- Gemfile.orig 2026-06-17 09:26:52 UTC +--- Gemfile.orig 2026-07-15 20:09:39 UTC +++ Gemfile -@@ -168,7 +168,7 @@ gem 'graphql', '2.6.3', feature_category: :api +@@ -176,7 +176,7 @@ gem 'graphql', '2.6.3', feature_category: :api # GraphQL API gem 'graphql', '2.6.3', feature_category: :api @@ -9,7 +9,7 @@ gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api # IAM service gRPC client stubs -@@ -303,7 +303,7 @@ gem 'state_machines-activerecord', '~> 0.100.0', featu +@@ -311,7 +311,7 @@ gem 'state_machines-activerecord', '~> 0.100.0', featu gem 'state_machines-activerecord', '~> 0.100.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Background jobs @@ -18,7 +18,7 @@ gem 'sidekiq-cron', '~> 2.3.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', -@@ -490,128 +490,6 @@ gem 'warning', '~> 1.5.0', feature_category: :shared # +@@ -501,128 +501,6 @@ gem 'warning', '~> 1.5.0', feature_category: :shared # gem 'warning', '~> 1.5.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 @@ -43,9 +43,9 @@ - - gem 'ruby-lsp-rspec', "~> 0.1.28", require: false, feature_category: :tooling - -- gem 'gdk-toogle', '~> 0.9', '>= 0.9.5', require: 'toogle', feature_category: :tooling +- gem 'gdk-toogle', '~> 1.0', require: 'toogle', feature_category: :tooling - -- gem 'grpc-tools', '~> 1.80.0', feature_category: :system_access +- gem 'grpc-tools', '~> 1.81.0', feature_category: :system_access - - # Used by - # * `lib/tasks/gitlab/security/update_banned_ssh_keys.rake` @@ -59,7 +59,7 @@ - gem 'parser', '= 3.3.11.1', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'pry-byebug', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'pry-rails', '~> 0.3.9', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -- gem 'pry-shell', '~> 0.6.4', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 +- gem 'pry-shell', '~> 0.7.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - - gem 'amazing_print', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - @@ -74,7 +74,7 @@ - gem 'spring-commands-rspec', '~> 1.0.4', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - - gem 'gitlab-styles', '~> 14.1', feature_category: :tooling, require: false -- gem 'haml_lint', '~> 0.58', feature_category: :tooling, require: false +- gem 'haml_lint', '~> 0.75', feature_category: :tooling, require: false - - # Benchmarking & profiling - gem 'benchmark-ips', '~> 2.14.0', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 @@ -99,7 +99,7 @@ - gem 'yard', '~> 0.9', require: false, feature_category: :tooling - - # Gems required for Dangerfile -- gem 'gitlab-dangerfiles', '~> 4.11.1', require: false, feature_category: :tooling +- gem 'gitlab-dangerfiles', '~> 4.12.0', require: false, feature_category: :tooling - - # Gems required for code coverage - gem 'simplecov', '~> 0.22', require: false, feature_category: :tooling @@ -132,13 +132,13 @@ - gem 'test-prof', '~> 1.6.0', feature_category: :tooling - gem 'rspec_junit_formatter', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - gem 'guard-rspec', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -- gem 'axe-core-rspec', '~> 4.10.0', feature_category: :tooling +- gem 'axe-core-rspec', '~> 4.12.0', feature_category: :tooling - gem 'state_machines-rspec', '~> 0.6', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - - # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 - gem 'derailed_benchmarks', require: false, feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 - -- gem 'gitlab_quality-test_tooling', '~> 3.16.0', require: false, feature_category: :tooling +- gem 'gitlab_quality-test_tooling', '~> 3.20.1', require: false, feature_category: :tooling - - # Test execution result export - gem 'gitlab-rspec-metrics-exporter', '~> 0.2.0', require: false, feature_category: :tooling @@ -147,7 +147,7 @@ gem 'octokit', '~> 9.0', feature_category: :importers # Needed by octokit: https://github.com/octokit/octokit.rb/pull/1688 gem 'faraday-multipart', '~> 1.0', feature_category: :importers -@@ -674,7 +552,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: : +@@ -690,7 +568,7 @@ gem 'gitlab-net-dns', '~> 0.15.0', feature_category: : gem 'gitlab-net-dns', '~> 0.15.0', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 # Countries list @@ -156,7 +156,7 @@ gem 'retriable', '~> 3.1.2', feature_category: :shared # rubocop:todo Gemfile/MissingFeatureCategory -- https://gitlab.com/gitlab-org/gitlab/-/issues/581839 -@@ -756,11 +634,16 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc +@@ -779,11 +657,16 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc gem 'duo_api', '~> 1.3', feature_category: :system_access @@ -172,10 +172,10 @@ -gem "i18n_data", "~> 0.13.1", feature_category: :system_access +gem "i18n_data", "~> 0.13", feature_category: :system_access - gem "gitlab-cloud-connector", "~> 1.51", require: 'gitlab/cloud_connector', feature_category: :plan_provisioning + gem "gitlab-cloud-connector", "~> 1.52", require: 'gitlab/cloud_connector', feature_category: :plan_provisioning -@@ -773,3 +656,4 @@ gem 'license_finder', '~> 7.0', require: false, featur +@@ -796,3 +679,4 @@ gem 'license_finder', '~> 7.0', require: false, featur # Gems required in omnibus-gitlab pipeline gem 'license_finder', '~> 7.0', require: false, feature_category: :build -+gem 'gitlab-dangerfiles', '~> 4.11.1', require: false, feature_category: :tooling ++gem 'gitlab-dangerfiles', '~> 4.12.0', require: false, feature_category: :tooling diff --git a/www/gitlab/files/patch-config_application.rb b/www/gitlab/files/patch-config_application.rb index 9099b1d3a7ab..7099a2bb18db 100644 --- a/www/gitlab/files/patch-config_application.rb +++ b/www/gitlab/files/patch-config_application.rb @@ -1,7 +1,7 @@ ---- config/application.rb.orig 2025-02-13 06:21:36 UTC +--- config/application.rb.orig 2026-07-15 20:09:39 UTC +++ config/application.rb -@@ -1,6 +1,11 @@ require_relative 'boot' - # frozen_string_literal: true +@@ -2,6 +2,11 @@ require_relative 'boot' + require_relative 'boot' +# Required as rubygem-concurrent-ruby version 1.3.5 has remove logger, but is required by active_support diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example index 6c0885a52d26..c13c49598973 100644 --- a/www/gitlab/files/patch-config_gitlab.yml.example +++ b/www/gitlab/files/patch-config_gitlab.yml.example @@ -1,6 +1,6 @@ ---- config/gitlab.yml.example.orig 2026-06-17 09:26:52 UTC +--- config/gitlab.yml.example.orig 2026-07-15 20:09:39 UTC +++ config/gitlab.yml.example -@@ -583,7 +583,7 @@ production: &base +@@ -595,7 +595,7 @@ production: &base ## GitLab Pages pages: enabled: false @@ -9,7 +9,7 @@ # The location where pages are stored (default: shared/pages). # path: shared/pages -@@ -1358,7 +1358,7 @@ production: &base +@@ -1380,7 +1380,7 @@ production: &base repositories: storages: # You must have at least a `default` storage path. default: @@ -18,7 +18,7 @@ # For DNS-based load balancing with TLS, use: dns+tls://[authority_host]:[authority_port]/[host]:[port] # The host:port portion will be used as the TLS server name for SNI. # Example: dns+tls://1.1.1.1/gitaly.example.com:8075 -@@ -1367,7 +1367,7 @@ production: &base +@@ -1389,7 +1389,7 @@ production: &base ## Backup settings backup: path: "tmp/backups" # Relative paths are relative to Rails.root (default: tmp/backups/) @@ -27,7 +27,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 -@@ -1402,12 +1402,12 @@ production: &base +@@ -1424,12 +1424,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -43,7 +43,7 @@ # Git over HTTP upload_pack: true -@@ -1422,7 +1422,7 @@ production: &base +@@ -1444,7 +1444,7 @@ 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). @@ -52,7 +52,7 @@ database_traffic_capture: config: -@@ -1448,7 +1448,7 @@ production: &base +@@ -1470,7 +1470,7 @@ production: &base # enabled: true # File that contains the secret key for verifying access for gitlab-kas. # Default is '.gitlab_kas_secret' relative to Rails.root (i.e. root of the GitLab app). @@ -61,7 +61,7 @@ # The URL to the external KAS API (used by the Kubernetes agents) # external_url: wss://kas.example.com -@@ -1469,13 +1469,13 @@ production: &base +@@ -1491,13 +1491,13 @@ production: &base ## GitLab Elasticsearch settings elasticsearch: @@ -77,7 +77,7 @@ ## Webpack settings # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running -@@ -1496,18 +1496,18 @@ production: &base +@@ -1518,18 +1518,18 @@ production: &base # Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq. sidekiq_exporter: @@ -103,7 +103,7 @@ # Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma. web_exporter: -@@ -1756,13 +1756,13 @@ test: +@@ -1778,13 +1778,13 @@ test: gitaly_address: unix:tmp/tests/gitaly/praefect.socket gitaly: diff --git a/www/gitlab/pkg-message b/www/gitlab/pkg-message index 66f01c2ec926..986aacee5b84 100644 --- a/www/gitlab/pkg-message +++ b/www/gitlab/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.com/mfechner/freebsd-gitlab-docu/blob/master/install/19.1-freebsd.md +https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/install/19.2-freebsd.md EOM type: install } @@ -20,7 +20,7 @@ EOM If you just installed an major upgrade of GitLab, for example you switched from 18.6.x to 18.7.x, please follow the instructions in the guide at: -https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/19.0-19.1-freebsd.md +https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/19.1-19.2-freebsd.md If you just installed an minor upgrade of GitLab please follow the instructions in the guide at: