Date: Thu, 23 Jan 2025 10:00:35 GMT From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 2aad6426ce23 - 2025Q1 - www/gitlab: major upgrade to 17.8.0 Message-ID: <202501231000.50NA0Z6p087731@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2025Q1 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=2aad6426ce23f791d4b48cf6c9489060e625bee7 commit 2aad6426ce23f791d4b48cf6c9489060e625bee7 Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2025-01-16 09:39:07 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2025-01-23 09:48:04 +0000 www/gitlab: major upgrade to 17.8.0 Changes: https://about.gitlab.com/releases/2025/01/16/gitlab-17-8-released/ (cherry picked from commit 666e3688c218fc5b6d0e8c063df74eb3446dd16b) --- devel/gitaly/distinfo | 14 +- net/gitlab-agent/distinfo | 10 +- net/rubygem-gitlab-kas-grpc/distinfo | 6 +- www/gitlab-pages/distinfo | 10 +- www/gitlab-workhorse/distinfo | 10 +- www/gitlab/Makefile | 29 ++-- www/gitlab/Makefile.common | 2 +- www/gitlab/distinfo | 12 +- www/gitlab/files/patch-Gemfile | 162 ++++++++++----------- www/gitlab/files/patch-config_gitlab.yml.example | 16 +- ...ems_gitlab-backup-cli_gitlab-backup-cli.gemspec | 10 +- www/gitlab/pkg-message | 4 +- 12 files changed, 143 insertions(+), 142 deletions(-) diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index 3253a1ee687d..7a4e8c341a6c 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1736922688 -SHA256 (go/devel_gitaly/gitaly-v17.7.2/go.mod) = 44de13a991e9cd8ba5098fdad4913320593fcd9e13008636d823fcb01f6f2937 -SIZE (go/devel_gitaly/gitaly-v17.7.2/go.mod) = 12303 -SHA256 (go/devel_gitaly/gitaly-v17.7.2/gitaly-v17.7.2.tar.bz2) = d370fb372ba21cc712eeaf98d2bba7eb645de4508bef292b77673f642733d954 -SIZE (go/devel_gitaly/gitaly-v17.7.2/gitaly-v17.7.2.tar.bz2) = 4381706 -SHA256 (go/devel_gitaly/gitaly-v17.7.2/git-v2.47.0.tar.bz2) = bda955065ff46d04f980a25858b45352e49de18f04d8dd319b6a681c55ee4529 -SIZE (go/devel_gitaly/gitaly-v17.7.2/git-v2.47.0.tar.bz2) = 8892022 +TIMESTAMP = 1737007376 +SHA256 (go/devel_gitaly/gitaly-v17.8.0/go.mod) = 261a27c85b313537dc7204da0aff2b759da37364a91b8763e96194c7c7044d1d +SIZE (go/devel_gitaly/gitaly-v17.8.0/go.mod) = 12398 +SHA256 (go/devel_gitaly/gitaly-v17.8.0/gitaly-v17.8.0.tar.bz2) = b9afebff92576e09503b6f2127610067b84d8d23eea4ed356467236b1899e675 +SIZE (go/devel_gitaly/gitaly-v17.8.0/gitaly-v17.8.0.tar.bz2) = 4400988 +SHA256 (go/devel_gitaly/gitaly-v17.8.0/git-v2.47.0.tar.bz2) = bda955065ff46d04f980a25858b45352e49de18f04d8dd319b6a681c55ee4529 +SIZE (go/devel_gitaly/gitaly-v17.8.0/git-v2.47.0.tar.bz2) = 8892022 diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo index 1f8ea87f3b9c..3b17d3700a41 100644 --- a/net/gitlab-agent/distinfo +++ b/net/gitlab-agent/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1736923291 -SHA256 (go/net_gitlab-agent/gitlab-agent-v17.7.2/v17.7.2.mod) = 6a4e12fd0ac5ae463cf0e2871d1ed8abb25ff93a08474998057db5946b065588 -SIZE (go/net_gitlab-agent/gitlab-agent-v17.7.2/v17.7.2.mod) = 10151 -SHA256 (go/net_gitlab-agent/gitlab-agent-v17.7.2/v17.7.2.zip) = b8f649a89fccae5ebb929c424cf315d28c5d2002035ce532171dd3cdef6bf3e1 -SIZE (go/net_gitlab-agent/gitlab-agent-v17.7.2/v17.7.2.zip) = 1508958 +TIMESTAMP = 1737007560 +SHA256 (go/net_gitlab-agent/gitlab-agent-v17.8.0/v17.8.0.mod) = 4154ead7f7ea67f5b1a89eb211b9ceeea8a575e1d7739b66c084458f74e0c7f8 +SIZE (go/net_gitlab-agent/gitlab-agent-v17.8.0/v17.8.0.mod) = 10078 +SHA256 (go/net_gitlab-agent/gitlab-agent-v17.8.0/v17.8.0.zip) = cf5d1031916ecb06c5664c4b60cb45a86b465c1ac10bee61ee779ebc9115d5c0 +SIZE (go/net_gitlab-agent/gitlab-agent-v17.8.0/v17.8.0.zip) = 1571384 diff --git a/net/rubygem-gitlab-kas-grpc/distinfo b/net/rubygem-gitlab-kas-grpc/distinfo index ecd2bc615aa4..46473d336d3a 100644 --- a/net/rubygem-gitlab-kas-grpc/distinfo +++ b/net/rubygem-gitlab-kas-grpc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1736923364 -SHA256 (rubygem/gitlab-kas-grpc-17.7.2.gem) = af33f279cf051be61602d6b1349092c64f8d34f456e674394c8be63274f0de54 -SIZE (rubygem/gitlab-kas-grpc-17.7.2.gem) = 9216 +TIMESTAMP = 1737007622 +SHA256 (rubygem/gitlab-kas-grpc-17.8.0.gem) = 98df85216e84ba7b62fe6b656c68e67226a4618d0ba15bc4bfb314ec1948b85c +SIZE (rubygem/gitlab-kas-grpc-17.8.0.gem) = 10752 diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo index a281143e949a..3acf3db7fb65 100644 --- a/www/gitlab-pages/distinfo +++ b/www/gitlab-pages/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1736923294 -SHA256 (go/www_gitlab-pages/gitlab-pages-v17.7.2/go.mod) = 2f517dfd05ae0e005e3e1bcc69bbf1ab6ac3adf46d27fe7b98aa1f9182252ae1 -SIZE (go/www_gitlab-pages/gitlab-pages-v17.7.2/go.mod) = 3464 -SHA256 (go/www_gitlab-pages/gitlab-pages-v17.7.2/gitlab-pages-v17.7.2.tar.bz2) = 543d33f4c32fd77bca4ed72b07827a19be05278172d6949c9b648302876e71dd -SIZE (go/www_gitlab-pages/gitlab-pages-v17.7.2/gitlab-pages-v17.7.2.tar.bz2) = 231471 +TIMESTAMP = 1737007567 +SHA256 (go/www_gitlab-pages/gitlab-pages-v17.8.0/go.mod) = 0a2270c8237f0d394ca6409539d1e8639d5effb0ab9000cd13549aa0a53c7996 +SIZE (go/www_gitlab-pages/gitlab-pages-v17.8.0/go.mod) = 3464 +SHA256 (go/www_gitlab-pages/gitlab-pages-v17.8.0/gitlab-pages-v17.8.0.tar.bz2) = 49ffaf2205db0d3ef8d070f72d4d9d8a950b6801a0ba571b8d6c1a280ca18201 +SIZE (go/www_gitlab-pages/gitlab-pages-v17.8.0/gitlab-pages-v17.8.0.tar.bz2) = 232436 diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index ce059aef9f4d..d554ffd5aa9e 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1736923363 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.7.2/go.mod) = 03b555d2da65c1c14ef3d801265566f4a3d349b1b1045313e77f5786389c7b33 -SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.7.2/go.mod) = 7995 -SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.7.2/gitlab-foss-v17.7.2.tar.bz2) = 899c804300e3c4bb0d5e31e9b200bf239774515ab739e9b8d778ae50a19a6d4a -SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.7.2/gitlab-foss-v17.7.2.tar.bz2) = 128352103 +TIMESTAMP = 1737007622 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.8.0/go.mod) = 981ed1f4b3ca120ca4234c32a11114e8efa3acec171ff8265b91a00bc1707a54 +SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.8.0/go.mod) = 8008 +SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.8.0/gitlab-foss-v17.8.0.tar.bz2) = 337523dd4b2f0f8966c85a5aada0f85bed559742fd19502ce682baa0f1d323ff +SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.8.0/gitlab-foss-v17.8.0.tar.bz2) = 113114943 diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 19dc6b01c7a7..bb6a18d86979 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -41,15 +41,15 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-net-smtp>=0:mail/rubygem-net-smtp \ rubygem-psych3>=3.1<4:textproc/rubygem-psych3 \ rubygem-net-pop>=0:mail/rubygem-net-pop \ - rubygem-rails70>=7.0.8.6<7.1:www/rubygem-rails70 \ + rubygem-rails70>=7.0.8.7<7.1:www/rubygem-rails70 \ rubygem-bootsnap>=1.18.3<1.19:devel/rubygem-bootsnap \ - rubygem-ffi>=1.17<2:devel/rubygem-ffi \ + rubygem-ffi>=1.17.1<2:devel/rubygem-ffi \ rubygem-openssl>=3.2.0<4:security/rubygem-openssl \ - rubygem-ipaddr>=1.2.5<1.3:net/rubygem-ipaddr \ + rubygem-ipaddr>=1.2.7<1.3:net/rubygem-ipaddr \ 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.20.0<3.21:devel/rubygem-view_component-rails70 \ + rubygem-view_component-rails70>=3.21.0<3.22:devel/rubygem-view_component-rails70 \ rubygem-pg>=1.5.9<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= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-rubyzip>=2.3.2<2.4:archivers/rubygem-rubyzip \ rubygem-acme-client-gitlab>=2.0.19<3:security/rubygem-acme-client-gitlab \ rubygem-browser5>=5.3.1<5.4:www/rubygem-browser5 \ - rubygem-ohai>=18.1<19:sysutils/rubygem-ohai \ + rubygem-ohai>=18.1.18<19:sysutils/rubygem-ohai \ 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 \ @@ -134,9 +134,9 @@ 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.213.0<3.214:devel/rubygem-aws-sdk-core-gitlab \ + rubygem-aws-sdk-core-gitlab>=3.214.0<3.215:devel/rubygem-aws-sdk-core-gitlab \ rubygem-aws-sdk-cloudformation-gitlab>=1<2:devel/rubygem-aws-sdk-cloudformation-gitlab \ - rubygem-aws-sdk-s3-gitlab>=1.172.0<1.173:devel/rubygem-aws-sdk-s3-gitlab \ + rubygem-aws-sdk-s3-gitlab>=1.176.0<1.177: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>=1.4.0<1.5:www/rubygem-typhoeus \ @@ -174,7 +174,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-rainbow>=3.1.1<4.0:devel/rubygem-rainbow \ rubygem-ruby-progressbar>=1.11<2:devel/rubygem-ruby-progressbar \ rubygem-re2>=2.7.0<2.8:devel/rubygem-re2 \ - rubygem-semver_dialects>=3.0<4:devel/rubygem-semver_dialects \ + rubygem-semver_dialects>=3.4.5<4:devel/rubygem-semver_dialects \ 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 \ @@ -209,9 +209,9 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-base32>=0.3.0<0.4.0:converters/rubygem-base32 \ rubygem-gitlab-license>=2.6<3:devel/rubygem-gitlab-license \ rubygem-rack-attack>=6.7.0<6.8:www/rubygem-rack-attack \ - rubygem-sentry-ruby>=5.21.0<5.22:devel/rubygem-sentry-ruby \ - rubygem-sentry-rails>=5.21.0<5.22:devel/rubygem-sentry-rails \ - rubygem-sentry-sidekiq>=5.21.0<5.22:devel/rubygem-sentry-sidekiq \ + rubygem-sentry-ruby>=5.22.0<5.23:devel/rubygem-sentry-ruby \ + rubygem-sentry-rails>=5.22.0<5.23:devel/rubygem-sentry-rails \ + rubygem-sentry-sidekiq>=5.22.0<5.23:devel/rubygem-sentry-sidekiq \ rubygem-pg_query>=6.0.0<6.1:databases/rubygem-pg_query \ rubygem-premailer-rails-rails70>=1.12.0<1.13:mail/rubygem-premailer-rails-rails70 \ rubygem-gitlab-labkit>=0.37.0<0.38:devel/rubygem-gitlab-labkit \ @@ -251,6 +251,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ 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-git>=1.8<2:devel/rubygem-git \ rubygem-gitlab-dangerfiles>=4.8.0<4.9:devel/rubygem-gitlab-dangerfiles \ rubygem-license_finder-gitlab>=7.0.0<8:devel/rubygem-license_finder-gitlab \ rubygem-rspec>=3.0<4:devel/rubygem-rspec \ @@ -270,7 +271,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ 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.6.0:net/rubygem-gitaly \ + rubygem-gitaly>=17.7.0:net/rubygem-gitaly \ rubygem-gitlab-kas-grpc>=${GITLAB_VERSION}: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 \ @@ -307,7 +308,8 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \ rubygem-app_store_connect>=0:net/rubygem-app_store_connect \ rubygem-telesignenterprise>=2.2<3:devel/rubygem-telesignenterprise \ rubygem-net-protocol01>=0.1.3<0.2:net/rubygem-net-protocol01 \ - rubygem-net-http041>=0.4.1<0.4.2:www/rubygem-net-http041 \ + rubygem-net-http>=0.6.0<0.6.1:www/rubygem-net-http \ + rubygem-uri-gitlab>=0.13.0<0.13.1:net/rubygem-uri-gitlab \ 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 \ @@ -344,7 +346,6 @@ SHEBANG_FILES= scripts/build_qa_image \ scripts/build_gdk_image \ scripts/db_tasks \ scripts/rails-update-bisect \ - scripts/generate-e2e-pipeline \ scripts/frontend/codemods/vuex-to-pinia/migrate.sh \ scripts/frontend/execute-on-staged-files.sh \ scripts/frontend/start_storybook.sh \ diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common index 40a01cd6c4a8..89d0a45c4142 100644 --- a/www/gitlab/Makefile.common +++ b/www/gitlab/Makefile.common @@ -1,4 +1,4 @@ -GITLAB_VERSION= 17.7.2 +GITLAB_VERSION= 17.8.0 GITLAB_PORTREVISION= 0 # Git version gitaly should use (from gitlab mirror) diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo index 76260fbd20b0..b71f0374d712 100644 --- a/www/gitlab/distinfo +++ b/www/gitlab/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1736923283 -SHA256 (gitlab-foss-v17.7.2.tar.bz2) = 899c804300e3c4bb0d5e31e9b200bf239774515ab739e9b8d778ae50a19a6d4a -SIZE (gitlab-foss-v17.7.2.tar.bz2) = 128352103 -TIMESTAMP = 1736923284 -SHA256 (gitlab-v17.7.2-ee.tar.bz2) = 3c4ddb5bdf8a207f22512e8d677da9c61399d964f46997f7cf0c0ba030d6152a -SIZE (gitlab-v17.7.2-ee.tar.bz2) = 139152212 +TIMESTAMP = 1737007498 +SHA256 (gitlab-foss-v17.8.0.tar.bz2) = 337523dd4b2f0f8966c85a5aada0f85bed559742fd19502ce682baa0f1d323ff +SIZE (gitlab-foss-v17.8.0.tar.bz2) = 113114943 +TIMESTAMP = 1737007499 +SHA256 (gitlab-v17.8.0-ee.tar.bz2) = 5b5b1ba70c3d3df88a02ac73d29bc1328ba91cd25d6b5ed4355415f0ba7a8974 +SIZE (gitlab-v17.8.0-ee.tar.bz2) = 123952751 diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile index da0d9d1136a0..2a6efd049cd3 100644 --- a/www/gitlab/files/patch-Gemfile +++ b/www/gitlab/files/patch-Gemfile @@ -1,6 +1,6 @@ ---- Gemfile.orig 2024-12-18 06:12:05 UTC +--- Gemfile.orig 2025-01-15 09:55:34 UTC +++ Gemfile -@@ -160,7 +160,7 @@ gem 'graphql', '~> 2.4.1', feature_category: :api +@@ -164,7 +164,7 @@ gem 'graphql', '~> 2.4.1', feature_category: :api # GraphQL API gem 'graphql', '~> 2.4.1', feature_category: :api @@ -9,35 +9,35 @@ gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api gem 'graphlient', '~> 0.8.0', feature_category: :importers # Used by BulkImport feature (group::import) -@@ -212,7 +212,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 +@@ -216,7 +216,7 @@ gem 'google-cloud-storage', '~> 1.45.0', feature_categ + gem 'google-apis-storage_v1', '~> 0.29', feature_category: :shared + gem 'google-cloud-storage', '~> 1.45.0', feature_category: :shared # We need >= 0.11.1 because that's when match_glob support is added to list_objects --gem 'google-apis-core', '~> 0.11.0', '>= 0.11.1' # rubocop:todo Gemfile/MissingFeatureCategory -+gem 'google-apis-core', '~> 0.11', '>= 0.11.1' # 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 -@@ -223,7 +223,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 +-gem 'google-apis-core', '~> 0.11.0', '>= 0.11.1', feature_category: :shared ++gem 'google-apis-core', '~> 0.11', '>= 0.11.1', feature_category: :shared + gem 'google-apis-compute_v1', '~> 0.57.0', feature_category: :shared + gem 'google-apis-container_v1', '~> 0.43.0', feature_category: :shared + gem 'google-apis-container_v1beta1', '~> 0.43.0', feature_category: :shared +@@ -227,7 +227,7 @@ gem 'google-apis-androidpublisher_v3', '~> 0.34.0', fe + gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0', feature_category: :shared + gem 'google-apis-androidpublisher_v3', '~> 0.34.0', feature_category: :shared -gem 'googleauth', '~> 1.8.1', feature_category: :shared +gem 'googleauth', '~> 1.8', feature_category: :shared gem 'google-cloud-artifact_registry-v1', '~> 0.11.0', feature_category: :shared gem 'google-cloud-compute-v1', '~> 2.6.0', feature_category: :shared -@@ -276,7 +276,7 @@ group :puma do - gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base' # rubocop:todo Gemfile/MissingFeatureCategory +@@ -283,7 +283,7 @@ group :puma do + gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base', feature_category: :shared group :puma do - gem 'puma', '= 6.5.0', require: false, feature_category: :shared + gem 'puma', '~> 6.5.0', require: false, feature_category: :shared - gem 'sd_notify', '~> 0.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'sd_notify', '~> 0.1.0', require: false, feature_category: :shared end -@@ -284,7 +284,7 @@ gem 'state_machines-activerecord', '~> 0.8.0' # ruboco - gem 'state_machines-activerecord', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory +@@ -291,7 +291,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature + gem 'state_machines-activerecord', '~> 0.8.0', feature_category: :shared # Background jobs -gem 'sidekiq', path: 'vendor/gems/sidekiq-7.2.4', require: 'sidekiq', feature_category: :scalability @@ -45,71 +45,75 @@ gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', -@@ -423,7 +423,7 @@ gem 'snowplow-tracker', '~> 0.8.0' # rubocop:todo Gemf - gem 'snowplow-tracker', '~> 0.8.0' # rubocop:todo Gemfile/MissingFeatureCategory +@@ -431,7 +431,7 @@ gem 'snowplow-tracker', '~> 0.8.0', feature_category: + gem 'snowplow-tracker', '~> 0.8.0', feature_category: :product_analytics # Metrics --gem 'webrick', '~> 1.8.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory -+gem 'webrick', '~> 1.8', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'prometheus-client-mmap', '~> 1.1', '>= 1.1.1', require: 'prometheus/client' # rubocop:todo Gemfile/MissingFeatureCategory +-gem 'webrick', '~> 1.8.1', require: false, feature_category: :shared ++gem 'webrick', '~> 1.8', require: false, feature_category: :shared + gem 'prometheus-client-mmap', '~> 1.1', '>= 1.1.1', require: 'prometheus/client', feature_category: :shared # Event-driven reactor for Ruby -@@ -465,136 +465,15 @@ gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/Missi +@@ -474,140 +474,21 @@ group :development do + gem 'warning', '~> 1.3.0', feature_category: :shared - gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory - --group :development do + group :development do - 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 +- gem 'solargraph', '~> 0.47.2', require: false, feature_category: :shared - -- gem 'letter_opener_web', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory -- gem 'lookbook', '~> 2.3' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'letter_opener_web', '~> 3.0.0', feature_category: :shared +- gem 'lookbook', '~> 2.3', feature_category: :shared - - # Better errors handler -- gem 'better_errors', '~> 2.10.1' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'better_errors', '~> 2.10.1', feature_category: :shared - -- gem 'sprite-factory', '~> 1.7' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'sprite-factory', '~> 1.7', feature_category: :shared - -- gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'listen', '~> 3.7', feature_category: :shared - -- gem 'ruby-lsp', "~> 0.21.0", require: false, feature_category: :tooling +- gem 'ruby-lsp', "~> 0.22.0", require: false, feature_category: :tooling - - gem 'ruby-lsp-rails', "~> 0.3.6", feature_category: :tooling - - gem 'ruby-lsp-rspec', "~> 0.1.10", require: false, feature_category: :tooling - - gem 'gdk-toogle', '~> 0.9', '>= 0.9.5', require: 'toogle', feature_category: :tooling --end - + # Used by + # * `lib/tasks/gitlab/security/update_banned_ssh_keys.rake` + # * `lib/tasks/gitlab/db/migration_squash.rake` + gem 'git', '~> 1.8', feature_category: :shared + end + -group :development, :test do -- gem 'deprecation_toolkit', '~> 1.5.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory -- gem 'bullet', '~> 7.1.2' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'deprecation_toolkit', '~> 1.5.1', require: false, feature_category: :shared +- gem 'bullet', '~> 7.1.2', feature_category: :shared - gem 'parser', '= 3.3.6.0', feature_category: :shared -- 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 'pry-byebug', feature_category: :shared +- gem 'pry-rails', '~> 0.3.9', feature_category: :shared +- gem 'pry-shell', '~> 0.6.4', feature_category: :shared - -- gem 'awesome_print', require: false # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'awesome_print', require: false, feature_category: :shared - - gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database - gem 'rspec-rails', '~> 7.0.0', feature_category: :shared - gem 'factory_bot_rails', '~> 6.4.3', feature_category: :tooling - - # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) -- gem 'minitest', '~> 5.11.0' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'minitest', '~> 5.11.0', feature_category: :shared - -- gem 'spring', '~> 4.1.0' # rubocop:todo Gemfile/MissingFeatureCategory -- gem 'spring-commands-rspec', '~> 1.0.4' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'spring', '~> 4.1.0', feature_category: :shared +- gem 'spring-commands-rspec', '~> 1.0.4', feature_category: :shared - - gem 'gitlab-styles', '~> 13.0.2', feature_category: :tooling - gem 'haml_lint', '~> 0.58', feature_category: :tooling - -- gem 'bundler-audit', '~> 0.9.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'bundler-audit', '~> 0.9.1', require: false, feature_category: :shared - - # Benchmarking & profiling -- gem 'benchmark-ips', '~> 2.11.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory -- gem 'benchmark-memory', '~> 0.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'benchmark-ips', '~> 2.11.0', require: false, feature_category: :shared +- gem 'benchmark-memory', '~> 0.1', require: false, feature_category: :shared - - # Profiling data from CI/CD pipelines - gem 'influxdb-client', '~> 3.1', require: false, feature_category: :tooling @@ -118,15 +122,15 @@ - gem 'crystalball', '~> 0.7.0', require: false, feature_category: :tooling - gem 'test_file_finder', '~> 0.3.1', feature_category: :tooling - -- gem 'simple_po_parser', '~> 1.1.6', require: false # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'simple_po_parser', '~> 1.1.6', require: false, feature_category: :shared - -- gem 'png_quantizator', '~> 0.2.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'png_quantizator', '~> 0.2.1', require: false, feature_category: :shared - -- gem 'parallel', '~> 1.19', require: false # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'parallel', '~> 1.19', require: false, feature_category: :shared - -- gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup', feature_category: :shared - -- gem 'pact', '~> 1.64' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'pact', '~> 1.64', feature_category: :shared - - # For now we only use vite in development / test, and not for production builds - # See: https://gitlab.com/gitlab-org/frontend/rfcs/-/issues/106 @@ -149,17 +153,17 @@ - # Gems required in omnibus-gitlab pipeline group :development, :test, :omnibus do - gem 'license_finder', '~> 7.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory + gem 'license_finder', '~> 7.0', require: false, feature_category: :shared 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', path: 'gems/gitlab-rspec', feature_category: :shared - 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 'fuubar', '~> 2.2.0', feature_category: :tooling - gem 'rspec-retry', '~> 0.6.2', feature_category: :tooling - gem 'rspec_profiling', '~> 0.0.9', feature_category: :tooling - gem 'rspec-benchmark', '~> 0.6.0', feature_category: :tooling @@ -170,20 +174,20 @@ - 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 +- gem 'graphlyte', '~> 1.0.0', feature_category: :shared - -- gem 'shoulda-matchers', '~> 5.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory -- gem 'email_spec', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'shoulda-matchers', '~> 5.1.0', require: false, feature_category: :shared +- gem 'email_spec', '~> 2.2.0', feature_category: :shared - gem 'webmock', '~> 3.24.0', feature_category: :shared -- gem 'rails-controller-testing' # rubocop:todo Gemfile/MissingFeatureCategory -- gem 'concurrent-ruby', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'rails-controller-testing', feature_category: :shared +- gem 'concurrent-ruby', '~> 1.1', feature_category: :shared - 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 'rspec_junit_formatter', feature_category: :shared +- gem 'guard-rspec', feature_category: :shared - gem 'axe-core-rspec', '~> 4.9.0', feature_category: :tooling - - # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 -- gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory +- gem 'derailed_benchmarks', require: false, feature_category: :shared - - gem 'gitlab_quality-test_tooling', '~> 2.4.0', require: false, feature_category: :tooling -end @@ -191,16 +195,12 @@ 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 -@@ -629,16 +508,16 @@ 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.5.0.pre.rc1', feature_category: :gitaly -+gem 'gitaly', '~> 17.7.0', feature_category: :gitaly +@@ -645,13 +526,13 @@ gem 'gitaly', '~> 17.7.0', feature_category: :gitaly + gem 'gitaly', '~> 17.7.0', feature_category: :gitaly # KAS GRPC protocol definitions --gem 'gitlab-kas-grpc', '~> 17.6.1', feature_category: :deployment_management -+gem 'gitlab-kas-grpc', '~> 17.7.0', feature_category: :deployment_management +-gem 'gitlab-kas-grpc', '~> 17.7.0', feature_category: :deployment_management ++gem 'gitlab-kas-grpc', '~> 17.8.0', feature_category: :deployment_management # Lock the version before issues below are resolved: # https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939 @@ -209,20 +209,20 @@ -gem 'grpc', '= 1.63.0', feature_category: :shared +gem 'grpc', '~> 1.63', feature_category: :shared - gem 'google-protobuf', '~> 3.25', '>= 3.25.3' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared -@@ -659,7 +538,7 @@ gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfil - gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfile/MissingFeatureCategory +@@ -672,7 +553,7 @@ gem 'gitlab-net-dns', '~> 0.9.2', feature_category: :s + gem 'gitlab-net-dns', '~> 0.9.2', feature_category: :shared # Countries list --gem 'countries', '~> 4.0.0' # rubocop:todo Gemfile/MissingFeatureCategory -+gem 'countries', '~> 4.0' # rubocop:todo Gemfile/MissingFeatureCategory +-gem 'countries', '~> 4.0.0', feature_category: :shared ++gem 'countries', '~> 4.0', feature_category: :shared - gem 'retriable', '~> 3.1.2' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'retriable', '~> 3.1.2', feature_category: :shared -@@ -734,12 +613,17 @@ gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/Missing +@@ -752,12 +633,17 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc - gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'duo_api', '~> 1.3', feature_category: :system_access +gem 'parser' +gem 'net-smtp' @@ -231,9 +231,9 @@ + gem 'gitlab-sdk', '~> 0.3.0', feature_category: :application_instrumentation - gem 'openbao_client', path: 'gems/openbao_client' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'openbao_client', path: 'gems/openbao_client', feature_category: :artifact_security - gem 'paper_trail', '~> 15.0' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'paper_trail', '~> 15.0', feature_category: :shared -gem "i18n_data", "~> 0.13.1", feature_category: :system_access +gem "i18n_data", "~> 0.13", feature_category: :system_access diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example index 2735cd180083..08982f34de3d 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-12-18 06:12:05 UTC +--- config/gitlab.yml.example.orig 2025-01-15 09:55:34 UTC +++ config/gitlab.yml.example @@ -473,7 +473,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). -@@ -1210,13 +1210,13 @@ production: &base +@@ -1216,13 +1216,13 @@ production: &base repositories: storages: # You must have at least a `default` storage path. default: @@ -38,7 +38,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 -@@ -1251,12 +1251,12 @@ production: &base +@@ -1257,12 +1257,12 @@ production: &base ## GitLab Shell settings gitlab_shell: @@ -54,7 +54,7 @@ # Git over HTTP upload_pack: true -@@ -1271,7 +1271,7 @@ production: &base +@@ -1277,7 +1277,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). @@ -63,7 +63,7 @@ topology_service: # enabled: false -@@ -1289,7 +1289,7 @@ production: &base +@@ -1295,7 +1295,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). @@ -72,7 +72,7 @@ # The URL to the external KAS API (used by the Kubernetes agents) # external_url: wss://kas.example.com -@@ -1313,13 +1313,13 @@ production: &base +@@ -1319,13 +1319,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 -@@ -1340,18 +1340,18 @@ production: &base +@@ -1346,18 +1346,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: -@@ -1578,13 +1578,13 @@ test: +@@ -1584,13 +1584,13 @@ test: gitaly_address: unix:tmp/tests/gitaly/praefect.socket gitaly: diff --git a/www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec b/www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec index b71dcf9c0c56..f0aecede0f2a 100644 --- a/www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec +++ b/www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec @@ -1,15 +1,15 @@ ---- gems/gitlab-backup-cli/gitlab-backup-cli.gemspec.orig 2024-10-16 08:01:39 UTC +--- gems/gitlab-backup-cli/gitlab-backup-cli.gemspec.orig 2025-01-15 09:55:34 UTC +++ gems/gitlab-backup-cli/gitlab-backup-cli.gemspec -@@ -25,7 +25,7 @@ Gem::Specification.new do |spec| - spec.require_paths = ["lib"] +@@ -26,7 +26,7 @@ Gem::Specification.new do |spec| + spec.add_dependency "activerecord", ">= 7" spec.add_dependency "activesupport", ">= 7" - spec.add_dependency "googleauth", "~> 1.8.1" # https://gitlab.com/gitlab-org/gitlab/-/issues/449019 + spec.add_dependency "googleauth", "~> 1.8" # https://gitlab.com/gitlab-org/gitlab/-/issues/449019 spec.add_dependency "google-cloud-storage_transfer", "~> 1.2.0" + spec.add_dependency "pg", "~> 1.5.6" spec.add_dependency "rainbow", "~> 3.0" - spec.add_dependency "thor", "~> 1.3" -@@ -36,11 +36,11 @@ Gem::Specification.new do |spec| +@@ -38,11 +38,11 @@ Gem::Specification.new do |spec| spec.add_dependency "concurrent-ruby", "~> 1.1" spec.add_dependency "faraday", "~> 2" spec.add_dependency "google-protobuf", "~> 3.25", ">= 3.25.3" diff --git a/www/gitlab/pkg-message b/www/gitlab/pkg-message index 47830cb0f1eb..88de68410a7d 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.7-freebsd.md +https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/install/17.8-freebsd.md EOM type: install } @@ -20,7 +20,7 @@ EOM If you just installed an major upgrade of GitLab, for example you switched from 17.5.x to 17.6.x, please follow the instructions in the guide at: -https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/17.6-17.7-freebsd.md +https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/17.7-17.8-freebsd.md If you just installed an minor upgrade of GitLab please follow the instructions in the guide at:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501231000.50NA0Z6p087731>