git: 1dc0dbe0ba00 - main - www/gitlab: major update to 17.4.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 20 Sep 2024 05:26:36 UTC
The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=1dc0dbe0ba00f3bea6e0a70b6118cbc24ea17ef2 commit 1dc0dbe0ba00f3bea6e0a70b6118cbc24ea17ef2 Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2024-09-19 12:46:09 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2024-09-20 05:18:40 +0000 www/gitlab: major update to 17.4.0 Changes: https://about.gitlab.com/releases/2024/09/19/gitlab-17-4-released/ --- devel/gitaly/distinfo | 14 ++-- devel/gitlab-shell/Makefile | 2 +- devel/gitlab-shell/distinfo | 10 +-- net/gitlab-agent/distinfo | 10 +-- net/rubygem-gitaly/Makefile | 2 +- net/rubygem-gitaly/distinfo | 6 +- www/gitlab-pages/distinfo | 10 +-- www/gitlab-workhorse/distinfo | 10 +-- www/gitlab/Makefile | 81 ++++++++++++------------ www/gitlab/Makefile.common | 4 +- www/gitlab/distinfo | 12 ++-- www/gitlab/files/patch-Gemfile | 68 ++++++++++---------- www/gitlab/files/patch-config_gitlab.yml.example | 4 +- www/gitlab/pkg-message | 4 +- 14 files changed, 117 insertions(+), 120 deletions(-) diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index 9b22d5c87039..55267b4e6a2d 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1726548395 -SHA256 (go/devel_gitaly/gitaly-v17.3.3/go.mod) = 27f37cc992540a2c53a90a47c503860a012051134ac616859cc2e662ee9c0d54 -SIZE (go/devel_gitaly/gitaly-v17.3.3/go.mod) = 12846 -SHA256 (go/devel_gitaly/gitaly-v17.3.3/gitaly-v17.3.3.tar.bz2) = 8938fe7abe57eb0ddbda77f142106be836e8daff6674c529ae123aa43160113c -SIZE (go/devel_gitaly/gitaly-v17.3.3/gitaly-v17.3.3.tar.bz2) = 2914874 -SHA256 (go/devel_gitaly/gitaly-v17.3.3/git-v2.45.2.tar.bz2) = da929efd422d9e7e030ccbfac4c51acd56f63e96f67f2714fe906bf7f033604e -SIZE (go/devel_gitaly/gitaly-v17.3.3/git-v2.45.2.tar.bz2) = 8710568 +TIMESTAMP = 1726723188 +SHA256 (go/devel_gitaly/gitaly-v17.4.0/go.mod) = 6879310f467381a3ed45a19473b4c79a9e6351773df42e07c555a05c302bcbf4 +SIZE (go/devel_gitaly/gitaly-v17.4.0/go.mod) = 12862 +SHA256 (go/devel_gitaly/gitaly-v17.4.0/gitaly-v17.4.0.tar.bz2) = 7e9b5a2a7ade58f83ac694799c1ce2ccca12b606ce287afa747254854c95cfd8 +SIZE (go/devel_gitaly/gitaly-v17.4.0/gitaly-v17.4.0.tar.bz2) = 2954774 +SHA256 (go/devel_gitaly/gitaly-v17.4.0/git-v2.46.1.tar.bz2) = af8c4087aa193259c93bcc753156247c881b5790dfa184a3c84f2efe75cae783 +SIZE (go/devel_gitaly/gitaly-v17.4.0/git-v2.46.1.tar.bz2) = 8821150 diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile index b57f786d4616..809fcfd77137 100644 --- a/devel/gitlab-shell/Makefile +++ b/devel/gitlab-shell/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitlab-shell -PORTVERSION= 14.38.0 +PORTVERSION= 14.39.0 DISTVERSIONPREFIX= v CATEGORIES= devel diff --git a/devel/gitlab-shell/distinfo b/devel/gitlab-shell/distinfo index 912029793e8c..87899d382565 100644 --- a/devel/gitlab-shell/distinfo +++ b/devel/gitlab-shell/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1724586105 -SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.38.0/go.mod) = 00bddbd45813229c6a72e87051101ea76997822abb2ebf9bfea6fc69a3fcd9f6 -SIZE (go/devel_gitlab-shell/gitlab-shell-v14.38.0/go.mod) = 5327 -SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.38.0/gitlab-shell-v14.38.0.tar.bz2) = aa09fd94525c33782f4d1c18802fa6ceb180df6a03ce95e849f96baeb533b6ab -SIZE (go/devel_gitlab-shell/gitlab-shell-v14.38.0/gitlab-shell-v14.38.0.tar.bz2) = 157526 +TIMESTAMP = 1726723663 +SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.39.0/go.mod) = b067ad20a0f449568c24bc000c1c469f35e330c2116ab55280ff5d6827a531a6 +SIZE (go/devel_gitlab-shell/gitlab-shell-v14.39.0/go.mod) = 5505 +SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.39.0/gitlab-shell-v14.39.0.tar.bz2) = 13b10cd9b34189617777e5d63ecc13e49669e6fe44b320e54aec18eb25136d0e +SIZE (go/devel_gitlab-shell/gitlab-shell-v14.39.0/gitlab-shell-v14.39.0.tar.bz2) = 158123 diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo index 53d207a4cc11..4db9d781b892 100644 --- a/net/gitlab-agent/distinfo +++ b/net/gitlab-agent/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1726548398 -SHA256 (go/net_gitlab-agent/gitlab-agent-v17.3.3/v17.3.3.mod) = 394483a3087d074c2fbbf29414d34c1f75d176f33d2fb530275ad5ea8361ebb0 -SIZE (go/net_gitlab-agent/gitlab-agent-v17.3.3/v17.3.3.mod) = 8581 -SHA256 (go/net_gitlab-agent/gitlab-agent-v17.3.3/v17.3.3.zip) = 592964449a83999f0ef74e1cb1dcebad5ec958f2aff98c54c10fbe0802c8fe7b -SIZE (go/net_gitlab-agent/gitlab-agent-v17.3.3/v17.3.3.zip) = 1334033 +TIMESTAMP = 1726722995 +SHA256 (go/net_gitlab-agent/gitlab-agent-v17.4.0/v17.4.0.mod) = b97d1a40937e17a403f19c17005a4a696c7b7a78a9f710548301f478a00a35fa +SIZE (go/net_gitlab-agent/gitlab-agent-v17.4.0/v17.4.0.mod) = 8669 +SHA256 (go/net_gitlab-agent/gitlab-agent-v17.4.0/v17.4.0.zip) = 55bec24138c91dc68944cfc01725da108f9d29e904897c35ff76c494b2029b3d +SIZE (go/net_gitlab-agent/gitlab-agent-v17.4.0/v17.4.0.zip) = 1364257 diff --git a/net/rubygem-gitaly/Makefile b/net/rubygem-gitaly/Makefile index 7291424238d2..fece13ef28b6 100644 --- a/net/rubygem-gitaly/Makefile +++ b/net/rubygem-gitaly/Makefile @@ -1,5 +1,5 @@ PORTNAME= gitaly -PORTVERSION= 17.3.3 +PORTVERSION= 17.4.0 CATEGORIES= net rubygems MASTER_SITES= RG diff --git a/net/rubygem-gitaly/distinfo b/net/rubygem-gitaly/distinfo index 69367b01d226..5b92ebc27ce3 100644 --- a/net/rubygem-gitaly/distinfo +++ b/net/rubygem-gitaly/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1726548374 -SHA256 (rubygem/gitaly-17.3.3.gem) = b12c08e33f8384027d2967049e3db9f16a2451cf3c8046359795004e870a48c0 -SIZE (rubygem/gitaly-17.3.3.gem) = 48640 +TIMESTAMP = 1726720937 +SHA256 (rubygem/gitaly-17.4.0.gem) = 4da3b713a151fcdf1d08ad35dfd12895671dca8510ef92d8a88c040c618a907e +SIZE (rubygem/gitaly-17.4.0.gem) = 49664 diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo index 17641214f769..9df2f4ae3e0a 100644 --- a/www/gitlab-pages/distinfo +++ b/www/gitlab-pages/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1726548401 -SHA256 (go/www_gitlab-pages/gitlab-pages-v17.3.3/go.mod) = 93577d318362d9d4259b4ccfeda9e91e8af7ab256befb41845e5ccd4e37d55b5 -SIZE (go/www_gitlab-pages/gitlab-pages-v17.3.3/go.mod) = 3327 -SHA256 (go/www_gitlab-pages/gitlab-pages-v17.3.3/gitlab-pages-v17.3.3.tar.bz2) = ac3aeb08027f184ba7fb897892a7a03124ab4a7a8c8d9662717e55fba01cd88c -SIZE (go/www_gitlab-pages/gitlab-pages-v17.3.3/gitlab-pages-v17.3.3.tar.bz2) = 229380 +TIMESTAMP = 1726723027 +SHA256 (go/www_gitlab-pages/gitlab-pages-v17.4.0/go.mod) = 6ff49ea30f45d00e03846a8707a3a57725b3a020985ea35b78d52e983b4cbc86 +SIZE (go/www_gitlab-pages/gitlab-pages-v17.4.0/go.mod) = 3456 +SHA256 (go/www_gitlab-pages/gitlab-pages-v17.4.0/gitlab-pages-v17.4.0.tar.bz2) = 8423f1b895d0d13d1e0a25f2bce38a03e3c2967d55b6d03a6e8ca986f0fd1865 +SIZE (go/www_gitlab-pages/gitlab-pages-v17.4.0/gitlab-pages-v17.4.0.tar.bz2) = 230569 diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index 8cf64d9bd735..fb85dd90bf3a 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1726548452 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.3.3/go.mod) = 34bb920b000d41f8dc9da500411a9212a56d06b5e94e380b366c25ce5157bd68 -SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.3.3/go.mod) = 7141 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.3.3/gitlab-foss-v17.3.3.tar.bz2) = 21500f9a9e3f6c90111b28a373bbcc9f5c7d34741c9ff235f3ddf1b7713040b1 -SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.3.3/gitlab-foss-v17.3.3.tar.bz2) = 104073735 +TIMESTAMP = 1726723250 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.4.0/go.mod) = 2b446f8b88ec69df0276676f9ef0e63e750d690b31f8b1944264c0b988dd2704 +SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.4.0/go.mod) = 8244 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.4.0/gitlab-foss-v17.4.0.tar.bz2) = 371ff1e904489e80e5fe94ca32bc19078d449541ab55704a596f404bb2166a6e +SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.4.0/gitlab-foss-v17.4.0.tar.bz2) = 105612137 diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 3c2a74b728d8..01cf6e96f1c9 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -32,7 +32,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ gitlab-elasticsearch-indexer>=5.2.0:textproc/gitlab-elasticsearch-indexer \ gitlab-agent>=${GITLAB_VERSION}:net/gitlab-agent \ gitlab-pages>=${GITLAB_VERSION}:www/gitlab-pages \ - gitlab-shell>=14.38.0:devel/gitlab-shell \ + gitlab-shell>=14.39.0:devel/gitlab-shell \ gitlab-workhorse>=${GITLAB_VERSION}:www/gitlab-workhorse \ redis>=6.2.11:databases/redis \ yarn${NODEJS_SUFFIX}>=1.10.0:www/yarn${NODEJS_SUFFIX} \ @@ -48,7 +48,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-responders-rails70>=3.0<4.0:www/rubygem-responders-rails70 \ rubygem-sprockets3>=3.7.0<3.8:devel/rubygem-sprockets3 \ rubygem-sprockets-rails-rails70>=3.5.1<3.6:devel/rubygem-sprockets-rails-rails70 \ - rubygem-view_component-rails70>=3.13.0<3.14:devel/rubygem-view_component-rails70 \ + rubygem-view_component-rails70>=3.14.0<3.15:devel/rubygem-view_component-rails70 \ rubygem-pg>=1.5.6<1.6:databases/rubygem-pg \ rubygem-neighbor>=0.3.2<0.4:databases/rubygem-neighbor \ rubygem-rugged>=1.6<2:devel/rubygem-rugged \ @@ -90,7 +90,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-acme-client>=2.0.18<3:security/rubygem-acme-client \ rubygem-browser5>=5.3.1<5.4:www/rubygem-browser5 \ rubygem-ohai>=18.1<19:sysutils/rubygem-ohai \ - rubygem-gpgme>=2.0.23<2.1.0:security/rubygem-gpgme \ + rubygem-gpgme>=2.0.24<2.1.0:security/rubygem-gpgme \ rubygem-gitlab_omniauth-ldap>=2.2.0<2.3.0:net/rubygem-gitlab_omniauth-ldap \ rubygem-net-ldap017>=0.17.1<0.18:net/rubygem-net-ldap017 \ rubygem-grape20>=2.0.0<2.1:devel/rubygem-grape20 \ @@ -99,7 +99,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-grape-swagger-entity>=0.5.1<0.6:devel/rubygem-grape-swagger-entity \ rubygem-grape-path-helpers>=2.0.1<2.1:devel/rubygem-grape-path-helpers \ rubygem-rack-cors>=2.0.1<2.1:www/rubygem-rack-cors \ - rubygem-graphql>=2.3.5<2.4:devel/rubygem-graphql \ + rubygem-graphql>=2.3.14<2.4:devel/rubygem-graphql \ rubygem-graphiql-rails>=1.10<1.11:devel/rubygem-graphiql-rails \ rubygem-apollo_upload_server>=2.1.6<2.2:net/rubygem-apollo_upload_server \ rubygem-graphlient>=0.8.0<0.9:devel/rubygem-graphlient \ @@ -109,12 +109,12 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-hamlit>=2.15.0<2.16:www/rubygem-hamlit \ rubygem-carrierwave1>=1.3.4<2.0:www/rubygem-carrierwave1 \ rubygem-mini_magick4>=4.12<5:graphics/rubygem-mini_magick4 \ - rubygem-fog-aws>=3.18<4:net/rubygem-fog-aws \ + rubygem-fog-aws>=3.26<4:net/rubygem-fog-aws \ rubygem-fog-core210>=2.1.0<2.1.1:devel/rubygem-fog-core210 \ rubygem-fog-google>=1.24.1<1.25:net/rubygem-fog-google \ rubygem-fog-local>=0.8<1.0:net/rubygem-fog-local \ rubygem-fog-aliyun>=0.4<1.0:net/rubygem-fog-aliyun \ - rubygem-gitlab-fog-azure-rm>=2.0.1<2.1:net/rubygem-gitlab-fog-azure-rm \ + rubygem-gitlab-fog-azure-rm>=2.1.0<2.2:net/rubygem-gitlab-fog-azure-rm \ rubygem-google-apis-storage_v1>=0.29<1:devel/rubygem-google-apis-storage_v1 \ rubygem-google-cloud-storage145>=1.45.0<1.46:net/rubygem-google-cloud-storage145 \ rubygem-google-apis-core>=0.11.2<2:devel/rubygem-google-apis-core \ @@ -134,9 +134,9 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-elasticsearch-model713>=7.2<8:textproc/rubygem-elasticsearch-model713 \ rubygem-elasticsearch-rails7>=7.2<8:textproc/rubygem-elasticsearch-rails7 \ rubygem-elasticsearch-api7>=7.17.11<7.18:textproc/rubygem-elasticsearch-api7 \ - rubygem-aws-sdk-core>=3.201.0<4:devel/rubygem-aws-sdk-core \ + rubygem-aws-sdk-core>=3.202.0<4:devel/rubygem-aws-sdk-core \ rubygem-aws-sdk-cloudformation>=1<2:devel/rubygem-aws-sdk-cloudformation \ - rubygem-aws-sdk-s3>=1.157.0<2:devel/rubygem-aws-sdk-s3 \ + rubygem-aws-sdk-s3>=1.159.0<2:devel/rubygem-aws-sdk-s3 \ rubygem-faraday-typhoeus>=1.1<2:www/rubygem-faraday-typhoeus \ rubygem-faraday_middleware-aws-sigv4>=1.0.1<1.1:devel/rubygem-faraday_middleware-aws-sigv4 \ rubygem-typhoeus>=1.4.0<1.5:www/rubygem-typhoeus \ @@ -157,15 +157,15 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-truncato>=0.7.12<0.8.0:textproc/rubygem-truncato \ rubygem-tty-prompt>=0.23<1:devel/rubygem-tty-prompt \ rubygem-nokogiri>=1.16<2:textproc/rubygem-nokogiri \ - rubygem-gitlab-glfm-markdown>=0.0.17<0.1:textproc/rubygem-gitlab-glfm-markdown \ - rubygem-icalendar>=2.10.1<2.11:devel/rubygem-icalendar \ + rubygem-gitlab-glfm-markdown>=0.0.20<0.1:textproc/rubygem-gitlab-glfm-markdown \ + rubygem-icalendar>=2.10.2<2.11:devel/rubygem-icalendar \ rubygem-diffy>=3.4<4:textproc/rubygem-diffy \ rubygem-rack22>=2.2.9,3<2.3,3:www/rubygem-rack22 \ rubygem-rack-timeout>=0.7.0<0.8:www/rubygem-rack-timeout \ 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-sidekiq71>=7.1.6<7.2:devel/rubygem-sidekiq71 \ + rubygem-sidekiq72>=7.2.4<7.3:devel/rubygem-sidekiq72 \ rubygem-sidekiq-cron-rails70>=1.12.0<1.13:devel/rubygem-sidekiq-cron-rails70 \ rubygem-fugit18>=1.8.1<1.9:devel/rubygem-fugit18 \ rubygem-httparty021>=0.21.0<0.22:www/rubygem-httparty021 \ @@ -177,8 +177,8 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-js_regex>=3.8<4.0:textproc/rubygem-js_regex \ rubygem-device_detector>=0:devel/rubygem-device_detector \ rubygem-redis-namespace>=1.11.0<1.12:databases/rubygem-redis-namespace \ - rubygem-redis52>=5.2.0<5.3:databases/rubygem-redis52 \ - rubygem-redis-clustering52>=5.2.0<5.3:databases/rubygem-redis-clustering52 \ + rubygem-redis>=5.3.0<5.4:databases/rubygem-redis \ + rubygem-redis-clustering>=5.3.0<5.4:databases/rubygem-redis-clustering \ rubygem-connection_pool>=2.4.1<3.0:net/rubygem-connection_pool \ rubygem-redis-actionpack-rails70>=5.4.0<5.5:databases/rubygem-redis-actionpack-rails70 \ rubygem-discordrb-webhooks>=3.5<4.0:net-im/rubygem-discordrb-webhooks \ @@ -208,9 +208,9 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-base32>=0.3.0<0.4.0:converters/rubygem-base32 \ rubygem-gitlab-license>=2.5<3:devel/rubygem-gitlab-license \ rubygem-rack-attack>=6.7.0<6.8:www/rubygem-rack-attack \ - rubygem-sentry-ruby>=5.18.0<5.19:devel/rubygem-sentry-ruby \ - rubygem-sentry-rails>=5.18.0<5.19:devel/rubygem-sentry-rails \ - rubygem-sentry-sidekiq>=5.18.0<5.19:devel/rubygem-sentry-sidekiq \ + rubygem-sentry-ruby>=5.19.0<5.20:devel/rubygem-sentry-ruby \ + rubygem-sentry-rails>=5.19.0<5.20:devel/rubygem-sentry-rails \ + rubygem-sentry-sidekiq>=5.19.0<5.20:devel/rubygem-sentry-sidekiq \ rubygem-pg_query>=5.1.0<5.2:databases/rubygem-pg_query \ rubygem-premailer-rails-rails70>=1.12.0<1.13:mail/rubygem-premailer-rails-rails70 \ rubygem-gitlab-labkit>=0.36.0<0.37:devel/rubygem-gitlab-labkit \ @@ -225,29 +225,30 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-webrick>=1.8.1<1.9:www/rubygem-webrick \ rubygem-prometheus-client-mmap>=1.1.1<2:devel/rubygem-prometheus-client-mmap \ rubygem-async212>=2.12.1<2.13:devel/rubygem-async212 \ - rubygem-opentelemetry-sdk>=1.4.0:devel/rubygem-opentelemetry-sdk \ + rubygem-gitlab-security_report_schemas>=0.1.2.min15.0.0.max15.2.0<0.1.2.min15.0.0.max15.2.1:devel/rubygem-gitlab-security_report_schemas \ + rubygem-opentelemetry-sdk>=1.5.0:devel/rubygem-opentelemetry-sdk \ rubygem-opentelemetry-exporter-otlp>=0.26.3:devel/rubygem-opentelemetry-exporter-otlp \ - rubygem-opentelemetry-instrumentation-active_support>=0.5.1:devel/rubygem-opentelemetry-instrumentation-active_support \ + rubygem-opentelemetry-instrumentation-active_support>=0.6.0:devel/rubygem-opentelemetry-instrumentation-active_support \ rubygem-opentelemetry-instrumentation-action_pack>=0.9.0:devel/rubygem-opentelemetry-instrumentation-action_pack \ - rubygem-opentelemetry-instrumentation-active_job>=0.7.1:devel/rubygem-opentelemetry-instrumentation-active_job \ - rubygem-opentelemetry-instrumentation-active_record>=0.7.0:devel/rubygem-opentelemetry-instrumentation-active_record \ - rubygem-opentelemetry-instrumentation-action_view>=0.7.0:devel/rubygem-opentelemetry-instrumentation-action_view \ - rubygem-opentelemetry-instrumentation-aws_sdk>=0.5.1:devel/rubygem-opentelemetry-instrumentation-aws_sdk \ - rubygem-opentelemetry-instrumentation-http>=0.23.2:devel/rubygem-opentelemetry-instrumentation-http \ - rubygem-opentelemetry-instrumentation-concurrent_ruby>=0.21.2:devel/rubygem-opentelemetry-instrumentation-concurrent_ruby \ - rubygem-opentelemetry-instrumentation-ethon>=0.21.3:devel/rubygem-opentelemetry-instrumentation-ethon \ - rubygem-opentelemetry-instrumentation-excon>=0.22.0:devel/rubygem-opentelemetry-instrumentation-excon \ - rubygem-opentelemetry-instrumentation-faraday>=0.24.0:devel/rubygem-opentelemetry-instrumentation-faraday \ - rubygem-opentelemetry-instrumentation-grape>=0.1.6:devel/rubygem-opentelemetry-instrumentation-grape \ - rubygem-opentelemetry-instrumentation-graphql>=0.28.0:devel/rubygem-opentelemetry-instrumentation-graphql \ - rubygem-opentelemetry-instrumentation-http_client>=0.22.3:devel/rubygem-opentelemetry-instrumentation-http_client \ - rubygem-opentelemetry-instrumentation-net_http>=0.22.4:devel/rubygem-opentelemetry-instrumentation-net_http \ - rubygem-opentelemetry-instrumentation-pg>=0.27.1:devel/rubygem-opentelemetry-instrumentation-pg \ - rubygem-opentelemetry-instrumentation-rack>=0.24.0:devel/rubygem-opentelemetry-instrumentation-rack \ - rubygem-opentelemetry-instrumentation-rails>=0.30.0:devel/rubygem-opentelemetry-instrumentation-rails \ + rubygem-opentelemetry-instrumentation-active_job>=0.7.7:devel/rubygem-opentelemetry-instrumentation-active_job \ + rubygem-opentelemetry-instrumentation-active_record>=0.7.4:devel/rubygem-opentelemetry-instrumentation-active_record \ + rubygem-opentelemetry-instrumentation-action_view>=0.7.2:devel/rubygem-opentelemetry-instrumentation-action_view \ + rubygem-opentelemetry-instrumentation-aws_sdk>=0.5.4:devel/rubygem-opentelemetry-instrumentation-aws_sdk \ + rubygem-opentelemetry-instrumentation-http>=0.23.4:devel/rubygem-opentelemetry-instrumentation-http \ + rubygem-opentelemetry-instrumentation-concurrent_ruby>=0.21.4:devel/rubygem-opentelemetry-instrumentation-concurrent_ruby \ + rubygem-opentelemetry-instrumentation-ethon>=0.21.8:devel/rubygem-opentelemetry-instrumentation-ethon \ + rubygem-opentelemetry-instrumentation-excon>=0.22.4:devel/rubygem-opentelemetry-instrumentation-excon \ + rubygem-opentelemetry-instrumentation-faraday>=0.24.6:devel/rubygem-opentelemetry-instrumentation-faraday \ + rubygem-opentelemetry-instrumentation-grape>=0.2.0:devel/rubygem-opentelemetry-instrumentation-grape \ + rubygem-opentelemetry-instrumentation-graphql>=0.28.4:devel/rubygem-opentelemetry-instrumentation-graphql \ + rubygem-opentelemetry-instrumentation-http_client>=0.22.7:devel/rubygem-opentelemetry-instrumentation-http_client \ + rubygem-opentelemetry-instrumentation-net_http>=0.22.7:devel/rubygem-opentelemetry-instrumentation-net_http \ + rubygem-opentelemetry-instrumentation-pg>=0.28.0:devel/rubygem-opentelemetry-instrumentation-pg \ + rubygem-opentelemetry-instrumentation-rack>=0.24.6:devel/rubygem-opentelemetry-instrumentation-rack \ + rubygem-opentelemetry-instrumentation-rails>=0.31.2:devel/rubygem-opentelemetry-instrumentation-rails \ rubygem-opentelemetry-instrumentation-rake>=0.2.1:devel/rubygem-opentelemetry-instrumentation-rake \ - rubygem-opentelemetry-instrumentation-redis>=0.25.3:devel/rubygem-opentelemetry-instrumentation-redis \ - rubygem-opentelemetry-instrumentation-sidekiq>=0.25.2:devel/rubygem-opentelemetry-instrumentation-sidekiq \ + rubygem-opentelemetry-instrumentation-redis>=0.25.7:devel/rubygem-opentelemetry-instrumentation-redis \ + rubygem-opentelemetry-instrumentation-sidekiq>=0.25.7:devel/rubygem-opentelemetry-instrumentation-sidekiq \ rubygem-warning>=1.3.0<1.4:devel/rubygem-warning \ rubygem-gitlab-dangerfiles>=4.8.0<4.9:devel/rubygem-gitlab-dangerfiles \ rubygem-license_finder>=7.0.0<8:devel/rubygem-license_finder \ @@ -268,8 +269,8 @@ 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>=17.2.0:net/rubygem-gitaly \ - rubygem-kas-grpc>=0.6.0,1<0.7.0,1:net/rubygem-kas-grpc \ + rubygem-gitaly>=17.4.0:net/rubygem-gitaly \ + rubygem-gitlab-kas-grpc>=17.4.0<17.5:net/rubygem-gitlab-kas-grpc \ rubygem-grpc>=1.63.0<2:net/rubygem-grpc \ rubygem-google-protobuf3>=3.25.3<4:devel/rubygem-google-protobuf3 \ rubygem-toml-rb>=2.2.0<3:www/rubygem-toml-rb \ @@ -301,7 +302,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-parser>=3.3.0.5: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.26.p.a1<0.0.27:net/rubygem-devfile \ + rubygem-devfile>=0.0.28.p.a1<0.0.29: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 \ @@ -309,6 +310,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \ rubygem-net-http>=0.4.1<0.4.2:www/rubygem-net-http \ rubygem-duo_api>=1.3<2:security/rubygem-duo_api \ rubygem-gitlab-sdk>=0.3.0<0.4:devel/rubygem-gitlab-sdk \ + rubygem-paper_trail>=15.0<16:devel/rubygem-paper_trail \ rubygem-google-cloud-profiler-v2>=0.3<1:textproc/rubygem-google-cloud-profiler-v2 \ rubygem-parallel>=1.22<2:sysutils/rubygem-parallel \ rubygem-google-cloud-storage_transfer12>=1.2.0<1.3:net/rubygem-google-cloud-storage_transfer12 @@ -341,7 +343,6 @@ SHEBANG_FILES= scripts/build_qa_image \ scripts/generate-e2e-pipeline \ scripts/frontend/execute-on-staged-files.sh \ scripts/frontend/start_storybook.sh \ - scripts/frontend/vite \ scripts/partitioning/generate-fk \ scripts/validate-monorepo-gem \ .lefthook/pre-push/merge_conflicts \ diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index aa72eadbd103..067972f3ba0b 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,10 +1,10 @@ -GITLAB_VERSION= 17.3.3 +GITLAB_VERSION= 17.4.0 GITLAB_PORTREVISION= 0 # Git version gitaly should use (from gitlab mirror) # Find current tag from Makefile and .gitlab-ci.yaml # and from https://gitlab.com/gitlab-org/git/-/tags -GITLAB_GIT_VERSION= 2.45.2 +GITLAB_GIT_VERSION= 2.46.1 # return something like x.yy GITLAB_GIT_VERSION_SHORT= ${GITLAB_GIT_VERSION:C/^([0-9]*\.[0-9]*)\..*/\1/} diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo index 75aeee05151f..5d8b40819daf 100644 --- a/www/gitlab/distinfo +++ b/www/gitlab/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1726548333 -SHA256 (gitlab-foss-v17.3.3.tar.bz2) = 21500f9a9e3f6c90111b28a373bbcc9f5c7d34741c9ff235f3ddf1b7713040b1 -SIZE (gitlab-foss-v17.3.3.tar.bz2) = 104073735 -TIMESTAMP = 1726548386 -SHA256 (gitlab-v17.3.3-ee.tar.bz2) = 167fae13955da30ac1a7873afcaa43abde108da04274be03954973c0c2004b60 -SIZE (gitlab-v17.3.3-ee.tar.bz2) = 113001807 +TIMESTAMP = 1726722599 +SHA256 (gitlab-foss-v17.4.0.tar.bz2) = 371ff1e904489e80e5fe94ca32bc19078d449541ab55704a596f404bb2166a6e +SIZE (gitlab-foss-v17.4.0.tar.bz2) = 105612137 +TIMESTAMP = 1726722650 +SHA256 (gitlab-v17.4.0-ee.tar.bz2) = 05b6d0c049f91c5e57d77a045b4ad44d2c98ce2a70c286a20e73b86eed7fce53 +SIZE (gitlab-v17.4.0-ee.tar.bz2) = 114597333 diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index 0da807cab28d..7f956cb65376 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,14 +1,15 @@ ---- Gemfile.orig 2024-09-16 16:10:31 UTC +--- Gemfile.orig 2024-09-18 10:07:13 UTC +++ Gemfile -@@ -156,7 +156,6 @@ gem 'graphql', '~> 2.3.5', feature_category: :api +@@ -156,7 +156,7 @@ gem 'graphql', '~> 2.3.14', feature_category: :api # GraphQL API - gem 'graphql', '~> 2.3.5', feature_category: :api + gem 'graphql', '~> 2.3.14', feature_category: :api -gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api ++#gem 'graphql-docs', '~> 5.0.0', group: [:development, :test], feature_category: :api gem 'graphiql-rails', '~> 1.10', feature_category: :api gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api gem 'graphlient', '~> 0.8.0', feature_category: :importers # Used by BulkImport feature (group::import) -@@ -209,7 +208,7 @@ gem 'google-cloud-storage', '~> 1.45.0' # rubocop:todo +@@ -209,7 +209,7 @@ gem 'google-cloud-storage', '~> 1.45.0' # rubocop:todo gem 'google-apis-storage_v1', '~> 0.29' # rubocop:todo Gemfile/MissingFeatureCategory gem 'google-cloud-storage', '~> 1.45.0' # rubocop:todo Gemfile/MissingFeatureCategory # We need >= 0.11.1 because that's when match_glob support is added to list_objects @@ -17,7 +18,7 @@ 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 -@@ -220,7 +219,7 @@ gem 'google-apis-androidpublisher_v3', '~> 0.34.0' # r +@@ -220,7 +220,7 @@ gem 'google-apis-androidpublisher_v3', '~> 0.34.0' # r gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'google-apis-androidpublisher_v3', '~> 0.34.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -26,19 +27,19 @@ gem 'google-cloud-artifact_registry-v1', '~> 0.11.0', feature_category: :shared gem 'google-cloud-compute-v1', '~> 2.6.0', feature_category: :shared -@@ -231,9 +230,9 @@ gem 'elasticsearch-api', '7.17.11', feature_category: +@@ -231,9 +231,9 @@ gem 'elasticsearch-api', '7.17.11', feature_category: gem 'elasticsearch-model', '~> 7.2', feature_category: :global_search gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation', feature_category: :global_search gem 'elasticsearch-api', '7.17.11', feature_category: :global_search --gem 'aws-sdk-core', '~> 3.201.0' # rubocop:todo Gemfile/MissingFeatureCategory -+gem 'aws-sdk-core', '~> 3.201' # rubocop:todo Gemfile/MissingFeatureCategory +-gem 'aws-sdk-core', '~> 3.202.0' # rubocop:todo Gemfile/MissingFeatureCategory ++gem 'aws-sdk-core', '~> 3.202' # rubocop:todo Gemfile/MissingFeatureCategory gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory --gem 'aws-sdk-s3', '~> 1.157.0' # rubocop:todo Gemfile/MissingFeatureCategory -+gem 'aws-sdk-s3', '~> 1.157' # rubocop:todo Gemfile/MissingFeatureCategory +-gem 'aws-sdk-s3', '~> 1.159.0' # rubocop:todo Gemfile/MissingFeatureCategory ++gem 'aws-sdk-s3', '~> 1.159' # rubocop:todo Gemfile/MissingFeatureCategory gem 'faraday-typhoeus', '~> 1.1', feature_category: :global_search gem 'faraday_middleware-aws-sigv4', '~> 1.0.1', feature_category: :global_search # Used with Elasticsearch to support http keep-alive connections -@@ -271,7 +270,7 @@ group :puma do +@@ -271,7 +271,7 @@ group :puma do gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base' # rubocop:todo Gemfile/MissingFeatureCategory group :puma do @@ -47,21 +48,21 @@ gem 'sd_notify', '~> 0.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory end -@@ -279,7 +278,7 @@ gem 'state_machines-activerecord', '~> 0.8.0' # ruboco +@@ -279,7 +279,7 @@ gem 'state_machines-activerecord', '~> 0.8.0' # ruboco gem 'state_machines-activerecord', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory # Background jobs --gem 'sidekiq', path: 'vendor/gems/sidekiq-7.1.6', require: 'sidekiq', feature_category: :scalability -+gem 'sidekiq', '~> 7.1.6', require: 'sidekiq', feature_category: :scalability +-gem 'sidekiq', path: 'vendor/gems/sidekiq-7.2.4', require: 'sidekiq', feature_category: :scalability ++gem 'sidekiq', '~> 7.2.4', require: 'sidekiq', feature_category: :scalability gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', -@@ -459,95 +458,10 @@ gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/Missi +@@ -462,136 +462,15 @@ gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/Missi gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory -group :development do -- gem 'lefthook', '~> 1.6.8', require: false, feature_category: :tooling +- gem 'lefthook', '~> 1.7.0', require: false, feature_category: :tooling - gem 'rubocop', feature_category: :tooling - gem 'solargraph', '~> 0.47.2', require: false # rubocop:todo Gemfile/MissingFeatureCategory - @@ -133,7 +134,7 @@ - # For now we only use vite in development / test, and not for production builds - # See: https://gitlab.com/gitlab-org/frontend/rfcs/-/issues/106 - gem 'vite_rails', '~> 3.0.17', feature_category: :shared -- gem 'vite_ruby', '~> 3.7.0', feature_category: :shared +- gem 'vite_ruby', '~> 3.8.0', feature_category: :shared - - gem 'gitlab-housekeeper', path: 'gems/gitlab-housekeeper', feature_category: :tooling -end @@ -152,10 +153,14 @@ # Gems required in omnibus-gitlab pipeline group :development, :test, :omnibus do gem 'license_finder', '~> 7.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory -@@ -559,36 +473,6 @@ end - gem 'gitlab-rspec_flaky', path: 'gems/gitlab-rspec_flaky', feature_category: :tooling end +-# Gems required in various pipelines +-group :development, :test, :monorepo do +- gem 'gitlab-rspec', path: 'gems/gitlab-rspec' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'gitlab-rspec_flaky', path: 'gems/gitlab-rspec_flaky', feature_category: :tooling +-end +- -group :test do - gem 'fuubar', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'rspec-retry', '~> 0.6.2', feature_category: :tooling @@ -164,9 +169,9 @@ - gem 'rspec-parameterized', '~> 1.0', '>= 1.0.2', require: false, feature_category: :tooling - gem 'os', '~> 1.1', '>= 1.1.4', feature_category: :tooling - -- gem 'capybara', '~> 3.40' # rubocop:todo Gemfile/MissingFeatureCategory -- gem 'capybara-screenshot', '~> 1.0.26' # rubocop:todo Gemfile/MissingFeatureCategory -- gem 'selenium-webdriver', '~> 4.21', '>= 4.21.1' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'capybara', '~> 3.40', feature_category: :test_platform +- gem 'capybara-screenshot', '~> 1.0.26', feature_category: :test_platform +- gem 'selenium-webdriver', '~> 4.21', '>= 4.21.1', feature_category: :test_platform - - gem 'graphlyte', '~> 1.0.0' # rubocop:todo Gemfile/MissingFeatureCategory - @@ -175,7 +180,7 @@ - gem 'webmock', '~> 3.23.0', feature_category: :shared - gem 'rails-controller-testing' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'concurrent-ruby', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory -- gem 'test-prof', '~> 1.3.3', feature_category: :tooling +- gem 'test-prof', '~> 1.4.0', feature_category: :tooling - gem 'rspec_junit_formatter' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'guard-rspec' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'axe-core-rspec', '~> 4.9.0', feature_category: :tooling @@ -183,22 +188,13 @@ - # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 - gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory - -- gem 'gitlab_quality-test_tooling', '~> 1.33.0', require: false, feature_category: :tooling +- gem 'gitlab_quality-test_tooling', '~> 1.38.0', require: false, feature_category: :tooling -end - 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 -@@ -623,7 +507,7 @@ gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/Mis - gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory - - # Gitaly GRPC protocol definitions --gem 'gitaly', '~> 17.2.0', feature_category: :gitaly -+gem 'gitaly', '~> 17.3.3', feature_category: :gitaly - - # KAS GRPC protocol definitions - gem 'kas-grpc', '~> 0.6.0', feature_category: :deployment_management -@@ -632,7 +516,7 @@ gem 'kas-grpc', '~> 0.6.0', feature_category: :deploym +@@ -635,7 +514,7 @@ gem 'gitlab-kas-grpc', '~> 17.4.0.pre.rc1', feature_ca # https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939 # Or we can upgrade to a more recent version as long as we can confirm # that it doesn't have the same issues. @@ -207,7 +203,7 @@ gem 'google-protobuf', '~> 3.25', '>= 3.25.3' # rubocop:todo Gemfile/MissingFeatureCategory -@@ -653,7 +537,7 @@ gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfil +@@ -656,7 +535,7 @@ gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfil gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfile/MissingFeatureCategory # Countries list @@ -216,7 +212,7 @@ gem 'retriable', '~> 3.1.2' # rubocop:todo Gemfile/MissingFeatureCategory -@@ -727,6 +611,11 @@ gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/Missing +@@ -730,6 +609,11 @@ gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/Missing gem 'net-http', '= 0.4.1', feature_category: :shared gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example index 703bd471d6d0..25c50397d1e2 100644 --- a/www/gitlab/files/patch-config_gitlab.yml.example +++ b/www/gitlab/files/patch-config_gitlab.yml.example @@ -1,4 +1,4 @@ ---- config/gitlab.yml.example.orig 2024-08-20 19:36:17 UTC +--- config/gitlab.yml.example.orig 2024-09-18 10:07:13 UTC +++ config/gitlab.yml.example @@ -473,7 +473,7 @@ production: &base ## GitLab Pages @@ -114,7 +114,7 @@ # Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma. web_exporter: -@@ -1580,13 +1580,13 @@ test: +@@ -1586,13 +1586,13 @@ test: gitaly_address: unix:tmp/tests/gitaly/praefect.socket gitaly: diff --git a/www/gitlab/pkg-message b/www/gitlab/pkg-message index ff008ee4e4fa..619235f65793 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/17.3-freebsd.md +https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/install/17.4-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.com/mfechner/freebsd-gitlab-docu/blob/master/update/17.1-17.3-freebsd.md +https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/17.3-17.4-freebsd.md If you just installed an minor upgrade of GitLab please follow the instructions in the guide at: