git: 2bfafad11c42 - main - www/gitlab-ce: major upgrade to 16.9.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 23 Feb 2024 13:18:50 UTC
The branch main has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=2bfafad11c42a8265f02fdfb809ea6618e79022c
commit 2bfafad11c42a8265f02fdfb809ea6618e79022c
Author: Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2024-02-23 05:48:51 +0000
Commit: Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2024-02-23 13:18:03 +0000
www/gitlab-ce: major upgrade to 16.9.0
Changes: https://about.gitlab.com/releases/2024/02/15/gitlab-16-9-released/
---
devel/gitaly/Makefile | 4 +-
devel/gitaly/distinfo | 10 ++--
textproc/gitlab-elasticsearch-indexer/Makefile | 4 +-
textproc/gitlab-elasticsearch-indexer/distinfo | 10 ++--
www/gitlab-ce/Makefile | 47 ++++++++-------
www/gitlab-ce/distinfo | 6 +-
www/gitlab-ce/files/patch-Gemfile | 67 ++++++++++++----------
.../files/patch-config_gitlab.yml.example | 14 ++---
www/gitlab-ce/pkg-message | 4 +-
www/gitlab-pages/Makefile | 4 +-
www/gitlab-pages/distinfo | 10 ++--
www/gitlab-workhorse/Makefile | 2 +-
www/gitlab-workhorse/distinfo | 10 ++--
13 files changed, 100 insertions(+), 92 deletions(-)
diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index b82e3aa70dab..424ea06b638e 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitaly
-DISTVERSION= 16.8.3
+DISTVERSION= 16.9.0
DISTVERSIONPREFIX= v
CATEGORIES= devel
@@ -19,7 +19,7 @@ BUILD_DEPENDS= bash>0:shells/bash \
${MY_DEPENDS}
RUN_DEPENDS= ${MY_DEPENDS}
-USES= cpe gmake go:modules,no_targets iconv pkgconfig ssl
+USES= cpe gmake go:modules,no_targets,1.21 iconv pkgconfig ssl
CPE_VENDOR= gitlab
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index c32d871c8ce4..64fa558240b8 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1708581108
-SHA256 (go/devel_gitaly/gitaly-v16.8.3/go.mod) = 114e8afe5f7e9000677d449a0d55972d9845f8c237cfc3eb98d673cf886006a7
-SIZE (go/devel_gitaly/gitaly-v16.8.3/go.mod) = 10585
-SHA256 (go/devel_gitaly/gitaly-v16.8.3/gitaly-v16.8.3.tar.bz2) = 91a5d01d82834914d41cd5048530e0f3d9bc850a4fa35e01ee67820310d08179
-SIZE (go/devel_gitaly/gitaly-v16.8.3/gitaly-v16.8.3.tar.bz2) = 2554439
+TIMESTAMP = 1708413587
+SHA256 (go/devel_gitaly/gitaly-v16.9.0/go.mod) = 08c1274c3bbbb20f6d826fb985593bb724c0760257ecc1028e7e33a7e2517c42
+SIZE (go/devel_gitaly/gitaly-v16.9.0/go.mod) = 10659
+SHA256 (go/devel_gitaly/gitaly-v16.9.0/gitaly-v16.9.0.tar.bz2) = 5bf2255280fdcb2fa744171acd4eea4323022f477db915954e0999a31de8eb12
+SIZE (go/devel_gitaly/gitaly-v16.9.0/gitaly-v16.9.0.tar.bz2) = 2570690
diff --git a/textproc/gitlab-elasticsearch-indexer/Makefile b/textproc/gitlab-elasticsearch-indexer/Makefile
index 2e34d589282d..1e7a87f95b12 100644
--- a/textproc/gitlab-elasticsearch-indexer/Makefile
+++ b/textproc/gitlab-elasticsearch-indexer/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitlab-elasticsearch-indexer
-PORTVERSION= 4.6.0
+PORTVERSION= 4.7.0
DISTVERSIONPREFIX= v
CATEGORIES= textproc
@@ -15,7 +15,7 @@ LIB_DEPENDS= libicui18n.so:devel/icu \
libicuuc.so:devel/icu
#RUN_DEPENDS= p5-Image-ExifTool>=0:graphics/p5-Image-ExifTool
-USES= gmake go:modules,no_targets pkgconfig
+USES= gmake go:modules,no_targets,1.21 pkgconfig
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
diff --git a/textproc/gitlab-elasticsearch-indexer/distinfo b/textproc/gitlab-elasticsearch-indexer/distinfo
index d038eb887b1c..5d2085888b11 100644
--- a/textproc/gitlab-elasticsearch-indexer/distinfo
+++ b/textproc/gitlab-elasticsearch-indexer/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1705862004
-SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.6.0/go.mod) = 1e09030556aa2aff46f7acd2d2fd6dd9366a2c4e8e0bddaa0bb041d9722d2c91
-SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.6.0/go.mod) = 4722
-SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.6.0/gitlab-elasticsearch-indexer-v4.6.0.tar.bz2) = c26b442198a4010019527ab6488329dce99f12d8cb5a528ed7e5dcfb5da912c4
-SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.6.0/gitlab-elasticsearch-indexer-v4.6.0.tar.bz2) = 59537
+TIMESTAMP = 1708413589
+SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.7.0/go.mod) = 47d7f6461dbc82e1c6f2b4f11776f8450a1654e1657161088a95468063ce315e
+SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.7.0/go.mod) = 4721
+SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.7.0/gitlab-elasticsearch-indexer-v4.7.0.tar.bz2) = 9c4ef50356aaea2acc64bcbfab3d286ffe4bf922a19d004b94b9a10977b69af5
+SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v4.7.0/gitlab-elasticsearch-indexer-v4.7.0.tar.bz2) = 58614
diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile
index 619d7f2fd843..caeb3af796b1 100644
--- a/www/gitlab-ce/Makefile
+++ b/www/gitlab-ce/Makefile
@@ -1,6 +1,5 @@
PORTNAME= gitlab-ce
-PORTVERSION= 16.8.3
-PORTREVISION= 3
+PORTVERSION= 16.9.0
DISTVERSIONPREFIX= v
CATEGORIES= www devel
@@ -25,8 +24,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
# mail/rubygem-net-pop is required as ruby 3.1 removed it
MY_DEPENDS= git>=2.41.0:devel/git \
gitaly>=${PORTVERSION}:devel/gitaly \
- gitlab-elasticsearch-indexer>=4.6.0:textproc/gitlab-elasticsearch-indexer \
- gitlab-agent>=16.8.0:net/gitlab-agent \
+ gitlab-elasticsearch-indexer>=4.7.0:textproc/gitlab-elasticsearch-indexer \
+ gitlab-agent>=16.9.2:net/gitlab-agent \
gitlab-pages>=${PORTVERSION}:www/gitlab-pages \
gitlab-shell>=14.33.0:devel/gitlab-shell \
gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \
@@ -38,7 +37,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-net-pop>=0:mail/rubygem-net-pop \
rubygem-psych3>=3.1<4:textproc/rubygem-psych3 \
rubygem-rails70>=7.0.8<7.1:www/rubygem-rails70 \
- rubygem-bootsnap117>=1.17.0<1.18:devel/rubygem-bootsnap117 \
+ rubygem-bootsnap>=1.18.3<1.19:devel/rubygem-bootsnap \
rubygem-openssl>=3.0<4:security/rubygem-openssl \
rubygem-ipaddr>=1.2.5<1.3:net/rubygem-ipaddr \
rubygem-responders-rails70>=3.0<4.0:www/rubygem-responders-rails70 \
@@ -93,11 +92,11 @@ 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.0<2.1:devel/rubygem-grape-path-helpers \
rubygem-rack-cors>=2.0.1<2.1:www/rubygem-rack-cors \
- rubygem-graphql>=2.0.27<2.1:devel/rubygem-graphql \
+ rubygem-graphql>=2.2.5<2.3:devel/rubygem-graphql \
rubygem-graphql-docs>=4.0.0<4.1.0:devel/rubygem-graphql-docs \
rubygem-graphiql-rails>=1.8.0<1.9:devel/rubygem-graphiql-rails \
rubygem-apollo_upload_server>=2.1.5<2.2:net/rubygem-apollo_upload_server \
- rubygem-graphlient>=0.5.0<0.6:devel/rubygem-graphlient \
+ rubygem-graphlient>=0.6.0<0.7:devel/rubygem-graphlient \
rubygem-ffaker>=2.10<3:devel/rubygem-ffaker \
rubygem-hashie>=5.0.0<5.1:devel/rubygem-hashie \
rubygem-kaminari-rails70>=1.2.2<1.3:www/rubygem-kaminari-rails70 \
@@ -122,13 +121,16 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-google-apis-serviceusage_v1>=0.28.0<0.29:devel/rubygem-google-apis-serviceusage_v1 \
rubygem-google-apis-sqladmin_v1beta4_041>=0.41.0<0.42:devel/rubygem-google-apis-sqladmin_v1beta4_041 \
rubygem-google-apis-androidpublisher_v3034>=0.34.0<0.35:devel/rubygem-google-apis-androidpublisher_v3034 \
+ rubygem-googleauth>=1.8.1<2:security/rubygem-googleauth \
+ rubygem-google-cloud-artifact_registry-v1>=0.11.0<0.12:textproc/rubygem-google-cloud-artifact_registry-v1 \
+ rubygem-google-cloud-compute-v1>=2.6.0<2.7:net/rubygem-google-cloud-compute-v1 \
rubygem-seed-fu>=2.3.7<2.4.0:databases/rubygem-seed-fu \
rubygem-elasticsearch-model713>=7.2<8:textproc/rubygem-elasticsearch-model713 \
rubygem-elasticsearch-rails>=7.2<8:textproc/rubygem-elasticsearch-rails \
rubygem-elasticsearch-api713>=7.13.3<7.13.4:textproc/rubygem-elasticsearch-api713 \
- rubygem-aws-sdk-core>=3.190<4:devel/rubygem-aws-sdk-core \
+ rubygem-aws-sdk-core>=3.191.1<4:devel/rubygem-aws-sdk-core \
rubygem-aws-sdk-cloudformation>=1<2:devel/rubygem-aws-sdk-cloudformation \
- rubygem-aws-sdk-s3>=1.142.0<2:devel/rubygem-aws-sdk-s3 \
+ rubygem-aws-sdk-s3>=1.143.0<2:devel/rubygem-aws-sdk-s3 \
rubygem-faraday_middleware-aws-sigv403>=0.3.0<0.4:devel/rubygem-faraday_middleware-aws-sigv403 \
rubygem-typhoeus>=1.4.0<1.5:www/rubygem-typhoeus \
rubygem-html-pipeline>=2.14.3<2.15:textproc/rubygem-html-pipeline \
@@ -147,7 +149,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-rouge>=4.2.0<4.3:textproc/rubygem-rouge \
rubygem-truncato>=0.7.12<0.8.0:textproc/rubygem-truncato \
rubygem-nokogiri>=1.16<2:textproc/rubygem-nokogiri \
- rubygem-gitlab-glfm-markdown>=0.0.11<0.1:textproc/rubygem-gitlab-glfm-markdown \
+ rubygem-gitlab-glfm-markdown>=0.0.12<0.1:textproc/rubygem-gitlab-glfm-markdown \
rubygem-icalendar>=0:devel/rubygem-icalendar \
rubygem-diffy>=3.4<4:textproc/rubygem-diffy \
rubygem-rack22>=2.2.8,3<2.3,3:www/rubygem-rack22 \
@@ -162,8 +164,8 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-httparty>=0.21.0<0.22:www/rubygem-httparty \
rubygem-rainbow>=3.1.1<4.0:devel/rubygem-rainbow \
rubygem-ruby-progressbar>=1.11<2:devel/rubygem-ruby-progressbar \
- rubygem-re2>=2.6.0<2.6.1:devel/rubygem-re2 \
- rubygem-semver_dialects>=1.5<2:devel/rubygem-semver_dialects \
+ rubygem-re2>=2.7.0<2.8:devel/rubygem-re2 \
+ rubygem-semver_dialects>=1.6.1<1.7: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 \
@@ -197,15 +199,15 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-gon-rails70>=6.4.0<6.5:www/rubygem-gon-rails70 \
rubygem-request_store15>=1.5.1<1.6:devel/rubygem-request_store15 \
rubygem-base32>=0.3.0<0.4.0:converters/rubygem-base32 \
- rubygem-gitlab-license>=2.3<3:devel/rubygem-gitlab-license \
+ rubygem-gitlab-license>=2.4<3:devel/rubygem-gitlab-license \
rubygem-rack-attack>=6.7.0<6.8:www/rubygem-rack-attack \
rubygem-sentry-raven>=3.1<4.0:devel/rubygem-sentry-raven \
rubygem-sentry-ruby>=5.10.0<5.11:devel/rubygem-sentry-ruby \
rubygem-sentry-rails>=5.10.0<5.11:devel/rubygem-sentry-rails \
rubygem-sentry-sidekiq>=5.10.0<5.11:devel/rubygem-sentry-sidekiq \
- rubygem-pg_query>=4.2.3<4.3:databases/rubygem-pg_query \
+ rubygem-pg_query>=5.1.0<5.2:databases/rubygem-pg_query \
rubygem-premailer-rails110-rails70>=1.10.3<1.11:mail/rubygem-premailer-rails110-rails70 \
- rubygem-gitlab-labkit>=0.35.0<0.36:devel/rubygem-gitlab-labkit \
+ rubygem-gitlab-labkit>=0.35.1<0.36:devel/rubygem-gitlab-labkit \
rubygem-thrift>=0.16.0:devel/rubygem-thrift \
rubygem-rails-i18n-rails70>=7.0<8:devel/rubygem-rails-i18n-rails70 \
rubygem-gettext_i18n_rails111>=1.11.0<1.12.0:devel/rubygem-gettext_i18n_rails111 \
@@ -219,7 +221,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-gitlab-dangerfiles>=4.6.0<4.7:devel/rubygem-gitlab-dangerfiles \
rubygem-license_finder>=7.0.0<8:devel/rubygem-license_finder \
rubygem-rspec>=3.0<4:devel/rubygem-rspec \
- rubygem-octokit6>=6.0<7:net/rubygem-octokit6 \
+ rubygem-octokit>=8.0<9:net/rubygem-octokit \
rubygem-gitlab-mail_room>=0.0.24<0.1.0:mail/rubygem-gitlab-mail_room \
rubygem-email_reply_trimmer>=0.1<1.0:mail/rubygem-email_reply_trimmer \
rubygem-html2text>=0:textproc/rubygem-html2text \
@@ -234,10 +236,10 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-net-ntp>0:net/rubygem-net-ntp \
rubygem-ssh_data>=1.3<2:security/rubygem-ssh_data \
rubygem-spamcheck>=1.3.0<1.4:net/rubygem-spamcheck \
- rubygem-gitaly>=16.7.0.rc1<16.9.0:net/rubygem-gitaly \
- rubygem-kas-grpc>=0.3.0,1<0.4.0,1:net/rubygem-kas-grpc \
- rubygem-grpc>=1.58.0<2:net/rubygem-grpc \
- rubygem-google-protobuf>=3.25.2<4:devel/rubygem-google-protobuf \
+ rubygem-gitaly>=16.9.0.rc3<16.10.0:net/rubygem-gitaly \
+ rubygem-kas-grpc>=0.4.0,1<0.5.0,1:net/rubygem-kas-grpc \
+ rubygem-grpc>=1.60.0<2:net/rubygem-grpc \
+ rubygem-google-protobuf>=3.25.1<4:devel/rubygem-google-protobuf \
rubygem-toml-rb>=2.2.0<3:www/rubygem-toml-rb \
rubygem-flipper026>=0.26.2<0.27:devel/rubygem-flipper026 \
rubygem-flipper-active_record-rails70>=0.26.2<0.27:databases/rubygem-flipper-active_record-rails70 \
@@ -267,14 +269,14 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-parser>=3.2.2.4:devel/rubygem-parser \
rubygem-cvss-suite>=3.0.1<3.1:security/rubygem-cvss-suite \
rubygem-arr-pm>=0.0.12<0.1:devel/rubygem-arr-pm \
- rubygem-devfile>=0.0.24.p.a1<0.0.25:net/rubygem-devfile \
+ rubygem-devfile>=0.0.25.p.a1<0.0.25: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 \
rubygem-net-protocol01>=0.1.3<0.2:net/rubygem-net-protocol01 \
rubygem-net-http011>=0.1.1<0.1.2:www/rubygem-net-http011 \
rubygem-duo_api>=1.3<2:security/rubygem-duo_api \
- rubygem-gitlab-sdk>0:devel/rubygem-gitlab-sdk \
+ rubygem-gitlab-sdk>=0.3.0<0.4:devel/rubygem-gitlab-sdk \
rubygem-google-cloud-profiler-v2>=0.3<1:textproc/rubygem-google-cloud-profiler-v2 \
rubygem-parallel>=1.22<2:sysutils/rubygem-parallel
@@ -315,6 +317,7 @@ SHEBANG_FILES= scripts/build_qa_image \
scripts/db_tasks \
scripts/rails-update-bisect \
scripts/generate-e2e-pipeline \
+ scripts/frontend/compare_css_compilers.sh \
scripts/frontend/execute-on-staged-files.sh \
scripts/frontend/start_storybook.sh \
scripts/partitioning/generate-fk \
diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo
index 5ccad42a4ab6..a6ed0e914b7e 100644
--- a/www/gitlab-ce/distinfo
+++ b/www/gitlab-ce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1708581111
-SHA256 (gitlab-foss-v16.8.3.tar.bz2) = e8e5c6fc34a919c65e0f829887eb5c65ec1846c624b7a95a9855e8822d3af9bf
-SIZE (gitlab-foss-v16.8.3.tar.bz2) = 100331015
+TIMESTAMP = 1708412939
+SHA256 (gitlab-foss-v16.9.0.tar.bz2) = bc497fc27e6e1e2c64325c763b2ac12a2d06d5f21a752ce05fa7e1d07ca4afc9
+SIZE (gitlab-foss-v16.9.0.tar.bz2) = 101526670
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index 19f968ceecac..47d9d5f73123 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig 2024-02-20 20:25:18 UTC
+--- Gemfile.orig 2024-02-14 14:42:02 UTC
+++ Gemfile
@@ -58,7 +58,7 @@ gem 'neighbor', '~> 0.2.3' # rubocop:todo Gemfile/Miss
@@ -38,19 +38,28 @@
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
-@@ -203,9 +203,9 @@ gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/Missi
+@@ -196,7 +196,7 @@ gem 'google-apis-serviceusage_v1', '~> 0.28.0' # ruboc
+ 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 '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
+
+@@ -207,9 +207,9 @@ gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/Missi
gem 'elasticsearch-model', '~> 7.2' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'elasticsearch-api', '7.13.3' # rubocop:todo Gemfile/MissingFeatureCategory
--gem 'aws-sdk-core', '~> 3.190.2' # rubocop:todo Gemfile/MissingFeatureCategory
-+gem 'aws-sdk-core', '~> 3.190' # rubocop:todo Gemfile/MissingFeatureCategory
+-gem 'aws-sdk-core', '~> 3.191.1' # rubocop:todo Gemfile/MissingFeatureCategory
++gem 'aws-sdk-core', '~> 3.191' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory
--gem 'aws-sdk-s3', '~> 1.142.0' # rubocop:todo Gemfile/MissingFeatureCategory
-+gem 'aws-sdk-s3', '~> 1.142' # rubocop:todo Gemfile/MissingFeatureCategory
+-gem 'aws-sdk-s3', '~> 1.143.0' # rubocop:todo Gemfile/MissingFeatureCategory
++gem 'aws-sdk-s3', '~> 1.143' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # rubocop:todo Gemfile/MissingFeatureCategory
-@@ -241,7 +241,7 @@ gem 'rack', '~> 2.2.8' # rubocop:todo Gemfile/MissingF
+@@ -245,7 +245,7 @@ gem 'rack', '~> 2.2.8' # rubocop:todo Gemfile/MissingF
gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base' # rubocop:todo Gemfile/MissingFeatureCategory
group :puma do
@@ -59,7 +68,7 @@
gem 'sd_notify', '~> 0.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
end
-@@ -252,7 +252,7 @@ gem 'state_machines-activerecord', '~> 0.8.0' # ruboco
+@@ -256,7 +256,7 @@ gem 'state_machines-activerecord', '~> 0.8.0' # ruboco
gem 'acts-as-taggable-on', '~> 10.0' # rubocop:todo Gemfile/MissingFeatureCategory
# Background jobs
@@ -68,12 +77,12 @@
gem 'sidekiq-cron', '~> 1.12.0', feature_category: :shared
gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', require: 'sidekiq-reliable-fetch' # rubocop:todo Gemfile/MissingFeatureCategory
-@@ -392,134 +392,15 @@ gem 'prometheus-client-mmap', '~> 1.1', '>= 1.1.1', re
+@@ -397,93 +397,10 @@ gem 'prometheus-client-mmap', '~> 1.1', '>= 1.1.1', re
gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
-group :development do
-- gem 'lefthook', '~> 1.5.5', require: false, feature_category: :tooling
+- gem 'lefthook', '~> 1.5.6', require: false, feature_category: :tooling
- gem 'rubocop', feature_category: :tooling
- gem 'solargraph', '~> 0.47.2', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-
@@ -87,7 +96,7 @@
-
- gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory
-
-- gem 'ruby-lsp', "~> 0.13.2", require: false, feature_category: :tooling
+- gem 'ruby-lsp', "~> 0.13.3", require: false, feature_category: :tooling
-
- gem 'ruby-lsp-rails', "~> 0.2.8", feature_category: :tooling
-
@@ -162,14 +171,10 @@
# Gems required in omnibus-gitlab pipeline
group :development, :test, :omnibus do
gem 'license_finder', '~> 7.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
+@@ -495,36 +412,6 @@ group :development, :test, :monorepo do
+ 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
@@ -178,15 +183,15 @@
- gem 'rspec-parameterized', '~> 1.0', require: false, feature_category: :tooling
- gem 'os', '~> 1.1', feature_category: :tooling
-
-- gem 'capybara', '~> 3.39', '>= 3.39.2' # rubocop:todo Gemfile/MissingFeatureCategory
+- gem 'capybara', '~> 3.40' # rubocop:todo Gemfile/MissingFeatureCategory
- gem 'capybara-screenshot', '~> 1.0.26' # rubocop:todo Gemfile/MissingFeatureCategory
-- gem 'selenium-webdriver', '~> 4.16' # rubocop:todo Gemfile/MissingFeatureCategory
+- gem 'selenium-webdriver', '~> 4.17' # rubocop:todo Gemfile/MissingFeatureCategory
-
- gem 'graphlyte', '~> 1.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
-
- gem 'shoulda-matchers', '~> 5.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
- gem 'email_spec', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
-- gem 'webmock', '~> 3.19.1' # rubocop:todo Gemfile/MissingFeatureCategory
+- gem 'webmock', '~> 3.20.0' # rubocop:todo Gemfile/MissingFeatureCategory
- gem 'rails-controller-testing' # rubocop:todo Gemfile/MissingFeatureCategory
- gem 'concurrent-ruby', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory
- gem 'test-prof', '~> 1.3.1' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -197,28 +202,28 @@
- # 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.11.0', require: false, feature_category: :tooling
+- gem 'gitlab_quality-test_tooling', '~> 1.14.2', require: false, feature_category: :tooling
-end
-
- gem 'octokit', '~> 6.0' # rubocop:todo Gemfile/MissingFeatureCategory
+ gem 'octokit', '~> 8.0', feature_category: :importers
gem 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :shared
-@@ -552,12 +433,12 @@ gem 'ssh_data', '~> 1.3' # rubocop:todo Gemfile/Missin
+@@ -557,12 +444,12 @@ gem 'ssh_data', '~> 1.3' # rubocop:todo Gemfile/Missin
gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
# Gitaly GRPC protocol definitions
--gem 'gitaly', '~> 16.7.0-rc1', feature_category: :gitaly
-+gem 'gitaly', '~> 16.7', feature_category: :gitaly
+-gem 'gitaly', '~> 16.9.0-rc3', feature_category: :gitaly
++gem 'gitaly', '~> 16.9', feature_category: :gitaly
# KAS GRPC protocol definitions
- gem 'kas-grpc', '~> 0.3.0', feature_category: :deployment_management
+ gem 'kas-grpc', '~> 0.4.0', feature_category: :deployment_management
-gem 'grpc', '~> 1.58.0' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'grpc', '~> 1.58' # rubocop:todo Gemfile/MissingFeatureCategory
- gem 'google-protobuf', '~> 3.25', '>= 3.25.2' # rubocop:todo Gemfile/MissingFeatureCategory
+ gem 'google-protobuf', '~> 3.25', '>= 3.25.1' # rubocop:todo Gemfile/MissingFeatureCategory
-@@ -578,7 +459,7 @@ gem 'grape_logging', '~> 1.8', feature_category: :api
+@@ -583,7 +470,7 @@ gem 'grape_logging', '~> 1.8', feature_category: :api
gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfile/MissingFeatureCategory
# Countries list
@@ -227,7 +232,7 @@
gem 'retriable', '~> 3.1.2' # rubocop:todo Gemfile/MissingFeatureCategory
-@@ -644,6 +525,7 @@ gem 'app_store_connect' # rubocop:todo Gemfile/Missing
+@@ -649,6 +536,7 @@ gem 'app_store_connect' # rubocop:todo Gemfile/Missing
gem 'telesignenterprise', '~> 2.2' # rubocop:todo Gemfile/MissingFeatureCategory
# BufferedIO patch
@@ -235,7 +240,7 @@
# Updating this version will require updating scripts/allowed_warnings.txt
gem 'net-protocol', '~> 0.1.3' # rubocop:todo Gemfile/MissingFeatureCategory
# Lock this until we make DNS rebinding work with the updated net-http:
-@@ -651,5 +533,11 @@ gem 'net-protocol', '~> 0.1.3' # rubocop:todo Gemfile/
+@@ -656,5 +544,11 @@ gem 'net-protocol', '~> 0.1.3' # rubocop:todo Gemfile/
gem 'net-http', '= 0.1.1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -246,4 +251,4 @@
+gem 'psych', '~> 3.1'
+
- gem 'gitlab-sdk', feature_category: :application_instrumentation
+ gem 'gitlab-sdk', '~> 0.3.0', feature_category: :application_instrumentation
diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example
index c02d76328794..1b5556be240b 100644
--- a/www/gitlab-ce/files/patch-config_gitlab.yml.example
+++ b/www/gitlab-ce/files/patch-config_gitlab.yml.example
@@ -1,4 +1,4 @@
---- config/gitlab.yml.example.orig 2024-01-17 10:09:09 UTC
+--- config/gitlab.yml.example.orig 2024-02-14 14:42:02 UTC
+++ config/gitlab.yml.example
@@ -463,7 +463,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).
-@@ -1201,13 +1201,13 @@ production: &base
+@@ -1209,13 +1209,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
-@@ -1242,12 +1242,12 @@ production: &base
+@@ -1250,12 +1250,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@@ -54,7 +54,7 @@
# Git over HTTP
upload_pack: true
-@@ -1262,13 +1262,13 @@ production: &base
+@@ -1270,13 +1270,13 @@ production: &base
workhorse:
# File that contains the secret key for verifying access for gitlab-workhorse.
# Default is '.gitlab_workhorse_secret' relative to Rails.root (i.e. root of the GitLab app).
@@ -70,7 +70,7 @@
# The URL to the external KAS API (used by the Kubernetes agents)
# external_url: wss://kas.example.com
-@@ -1292,13 +1292,13 @@ production: &base
+@@ -1300,13 +1300,13 @@ production: &base
## GitLab Elasticsearch settings
elasticsearch:
@@ -86,7 +86,7 @@
## Webpack settings
# If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
-@@ -1319,18 +1319,18 @@ production: &base
+@@ -1327,18 +1327,18 @@ production: &base
# Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq.
sidekiq_exporter:
@@ -112,7 +112,7 @@
# Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma.
web_exporter:
-@@ -1555,13 +1555,13 @@ test:
+@@ -1563,13 +1563,13 @@ test:
gitaly_address: unix:tmp/tests/gitaly/praefect.socket
gitaly:
diff --git a/www/gitlab-ce/pkg-message b/www/gitlab-ce/pkg-message
index c8e063367e96..506c59f2db32 100644
--- a/www/gitlab-ce/pkg-message
+++ b/www/gitlab-ce/pkg-message
@@ -6,7 +6,7 @@ Gitlab was installed successfully.
You now need to set up the various components of Gitlab, so please
follow the instructions in the guide at:
-https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/16.8-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/16.9-freebsd.md
EOM
type: install
}
@@ -20,7 +20,7 @@ EOM
If you just installed an major upgrade of GitLab, for example you
switched from 14.5.x to 14.6.x, please follow the instructions in the guide at:
-https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/16.7-16.8-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/16.8-16.9-freebsd.md
If you just installed an minor upgrade of GitLab please follow
the instructions in the guide at:
diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile
index d4395632bdd9..cce996e02199 100644
--- a/www/gitlab-pages/Makefile
+++ b/www/gitlab-pages/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitlab-pages
-PORTVERSION= 16.8.3
+PORTVERSION= 16.9.0
DISTVERSIONPREFIX= v
CATEGORIES= www
MASTER_SITES+= https://gitlab.com/gitlab-org/gitlab-pages/-/raw/v${DISTVERSION}/
@@ -12,7 +12,7 @@ WWW= https://gitlab.com/gitlab-org/gitlab-pages
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= go:modules
+USES= go:modules,1.21
GO_MODULE= gitlab.com/gitlab-org/gitlab-pages
USE_GITLAB= yes
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
index 9677d91d3cfe..84d3dc287852 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1708581083
-SHA256 (go/www_gitlab-pages/gitlab-pages-v16.8.3/go.mod) = a921362a600558c9a7399ca1f3bfe7763d81dd49dd66f8a010c4a1810ff26a8c
-SIZE (go/www_gitlab-pages/gitlab-pages-v16.8.3/go.mod) = 3295
-SHA256 (go/www_gitlab-pages/gitlab-pages-v16.8.3/gitlab-pages-v16.8.3.tar.bz2) = cd251b5882e9c1459a70c8cca92d10f90f6a1fca11304751dbfe774d99ec48d8
-SIZE (go/www_gitlab-pages/gitlab-pages-v16.8.3/gitlab-pages-v16.8.3.tar.bz2) = 211422
+TIMESTAMP = 1708413629
+SHA256 (go/www_gitlab-pages/gitlab-pages-v16.9.0/go.mod) = 70b1630e6a33beb18e349e7b8dcf035610c5e515842c9a5ddf881868af3f9e7b
+SIZE (go/www_gitlab-pages/gitlab-pages-v16.9.0/go.mod) = 3295
+SHA256 (go/www_gitlab-pages/gitlab-pages-v16.9.0/gitlab-pages-v16.9.0.tar.bz2) = cf6720fbd6fc2f52549eb0a8fde9bfede12c1f08b622a0a9eaa6604a9f336705
+SIZE (go/www_gitlab-pages/gitlab-pages-v16.9.0/gitlab-pages-v16.9.0.tar.bz2) = 212053
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index 31c3cec6550a..796a581e4eca 100644
--- a/www/gitlab-workhorse/Makefile
+++ b/www/gitlab-workhorse/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitlab-workhorse
-PORTVERSION= 16.8.3
+PORTVERSION= 16.9.0
DISTVERSIONPREFIX= v
CATEGORIES= www
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index 4203a696de28..865c11c383be 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1708581055
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.8.3/go.mod) = 4ef98c9480dc69d9ac8f0438a9964432a977593dd48d6006f2b7363fcb7f1c74
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.8.3/go.mod) = 6610
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.8.3/gitlab-foss-v16.8.3.tar.bz2) = e8e5c6fc34a919c65e0f829887eb5c65ec1846c624b7a95a9855e8822d3af9bf
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.8.3/gitlab-foss-v16.8.3.tar.bz2) = 100331015
+TIMESTAMP = 1708412875
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.9.0/go.mod) = 87061b1970210fe7f343802ce591af704fd46a0c5f51370783a692cc892372ec
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.9.0/go.mod) = 6614
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v16.9.0/gitlab-foss-v16.9.0.tar.bz2) = bc497fc27e6e1e2c64325c763b2ac12a2d06d5f21a752ce05fa7e1d07ca4afc9
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v16.9.0/gitlab-foss-v16.9.0.tar.bz2) = 101526670