git: 3d83b565d994 - main - www/gitlab: major upgrade to 17.1.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 03 Jul 2024 07:43:02 UTC
The branch main has been updated by mfechner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=3d83b565d994a0d10a83367987ac62f9d20b583a
commit 3d83b565d994a0d10a83367987ac62f9d20b583a
Author: Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2024-07-01 05:42:48 +0000
Commit: Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2024-07-03 07:42:25 +0000
www/gitlab: major upgrade to 17.1.0
Remove vendored sidekiq gem as it breaks gitlab for FreeBSD.
The vendored gem is used to keep gitlab compatible to redis 6.
See also:
https://gitlab.com/gitlab-org/gitlab/-/issues/468435
Changes: https://about.gitlab.com/releases/2024/06/20/gitlab-17-1-released/
---
devel/gitaly/Makefile | 2 +-
devel/gitaly/distinfo | 10 +--
devel/gitlab-shell/Makefile | 3 +-
devel/gitlab-shell/distinfo | 10 +--
net/gitlab-agent/Makefile | 2 +-
net/gitlab-agent/distinfo | 10 +--
www/gitlab-pages/Makefile | 2 +-
www/gitlab-pages/distinfo | 10 +--
www/gitlab-workhorse/Makefile | 2 +-
www/gitlab-workhorse/distinfo | 10 +--
www/gitlab/Makefile | 46 ++++++++-----
www/gitlab/distinfo | 12 ++--
www/gitlab/files/patch-Gemfile | 71 ++++++++++----------
www/gitlab/files/patch-config_gitlab.yml.example | 22 +++---
.../files/patch-config_initializers_1__settings.rb | 4 +-
...tch-config_initializers_redis__client__patch.rb | 78 ----------------------
...patch-vendor_gems_sidekiq-7.1.6_sidekiq.gemspec | 11 +++
www/gitlab/pkg-message | 4 +-
18 files changed, 127 insertions(+), 182 deletions(-)
diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 68a4a9b9e601..7150b41d40bc 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -1,6 +1,6 @@
PORTNAME= gitaly
DISTVERSIONPREFIX= v
-DISTVERSION= 17.0.3
+DISTVERSION= 17.1.0
CATEGORIES= devel
MAINTAINER= mfechner@FreeBSD.org
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 1dc815f4cd66..848b0a92d68f 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1719464206
-SHA256 (go/devel_gitaly/gitaly-v17.0.3/go.mod) = b3bc1c564079168d4d922a5dbde5fc43db3775820f008dd0266a6f5f10644015
-SIZE (go/devel_gitaly/gitaly-v17.0.3/go.mod) = 10988
-SHA256 (go/devel_gitaly/gitaly-v17.0.3/gitaly-v17.0.3.tar.bz2) = 3d0f41aee575c875de510cf9c7b8e3b2ce118d21500a19d0967bc5033eb7d59c
-SIZE (go/devel_gitaly/gitaly-v17.0.3/gitaly-v17.0.3.tar.bz2) = 2614553
+TIMESTAMP = 1718793266
+SHA256 (go/devel_gitaly/gitaly-v17.1.0/go.mod) = 46321e96184062643db930c26d8033bdb94f79cd766b3768b96cf2feced18b8b
+SIZE (go/devel_gitaly/gitaly-v17.1.0/go.mod) = 11095
+SHA256 (go/devel_gitaly/gitaly-v17.1.0/gitaly-v17.1.0.tar.bz2) = 74265df39beaa54734256747def4ee5b13d09c99af2f5bd7fa93a745034b6eee
+SIZE (go/devel_gitaly/gitaly-v17.1.0/gitaly-v17.1.0.tar.bz2) = 2630746
diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile
index 53b8921b1c0a..036a94e2d1f0 100644
--- a/devel/gitlab-shell/Makefile
+++ b/devel/gitlab-shell/Makefile
@@ -1,7 +1,6 @@
PORTNAME= gitlab-shell
-PORTVERSION= 14.35.0
+PORTVERSION= 14.36.0
DISTVERSIONPREFIX= v
-PORTREVISION= 2
CATEGORIES= devel
MAINTAINER= mfechner@FreeBSD.org
diff --git a/devel/gitlab-shell/distinfo b/devel/gitlab-shell/distinfo
index 97ea4607034d..98d9588b4e7c 100644
--- a/devel/gitlab-shell/distinfo
+++ b/devel/gitlab-shell/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1713637949
-SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.35.0/go.mod) = 05d82b61970ed59f55594e4457c0560f9de928ea0439bf6e40c0b7cf81ee9c14
-SIZE (go/devel_gitlab-shell/gitlab-shell-v14.35.0/go.mod) = 5375
-SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.35.0/gitlab-shell-v14.35.0.tar.bz2) = 962b98f04de977e3699820bbe06f51e68c0effa9f65953da9be248321ff4b046
-SIZE (go/devel_gitlab-shell/gitlab-shell-v14.35.0/gitlab-shell-v14.35.0.tar.bz2) = 149964
+TIMESTAMP = 1718793702
+SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.36.0/go.mod) = c28824464f523f79c5eff5f104f4c34fda80bcf62957e66d1e087a2cb2066109
+SIZE (go/devel_gitlab-shell/gitlab-shell-v14.36.0/go.mod) = 5424
+SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.36.0/gitlab-shell-v14.36.0.tar.bz2) = c1c9c0759ddf815ee37365cb48801273af19a25995685c9212b28abe2516500b
+SIZE (go/devel_gitlab-shell/gitlab-shell-v14.36.0/gitlab-shell-v14.36.0.tar.bz2) = 158039
diff --git a/net/gitlab-agent/Makefile b/net/gitlab-agent/Makefile
index 5d101068f71a..6a1732a597fc 100644
--- a/net/gitlab-agent/Makefile
+++ b/net/gitlab-agent/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitlab-agent
-PORTVERSION= 17.0.3
+PORTVERSION= 17.1.0
DISTVERSIONPREFIX= v
CATEGORIES= net
diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo
index c49f46e0415b..74523d575f25 100644
--- a/net/gitlab-agent/distinfo
+++ b/net/gitlab-agent/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1719464279
-SHA256 (go/net_gitlab-agent/gitlab-agent-v17.0.3/v17.0.3.mod) = d8774eb02565f5c192d37fbc7caacd3d27dbcabcbebecd5b4afcb5b32d3e0776
-SIZE (go/net_gitlab-agent/gitlab-agent-v17.0.3/v17.0.3.mod) = 7042
-SHA256 (go/net_gitlab-agent/gitlab-agent-v17.0.3/v17.0.3.zip) = c52f3335635c24a8775356d9217b9673e3546a72dc1a27322adb2d81c98b214b
-SIZE (go/net_gitlab-agent/gitlab-agent-v17.0.3/v17.0.3.zip) = 1213749
+TIMESTAMP = 1718868566
+SHA256 (go/net_gitlab-agent/gitlab-agent-v17.1.0/v17.1.0.mod) = 7ab7b64f4dbcbf2f73c13ae82253a7f4d9a05c7a1b16c90bf11b4bd084a41704
+SIZE (go/net_gitlab-agent/gitlab-agent-v17.1.0/v17.1.0.mod) = 7042
+SHA256 (go/net_gitlab-agent/gitlab-agent-v17.1.0/v17.1.0.zip) = ba255129d6d85a5cb01d61f241580facf2f4ec278f391c0bbaf64a51feaa899f
+SIZE (go/net_gitlab-agent/gitlab-agent-v17.1.0/v17.1.0.zip) = 1237638
diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile
index 64ef04d6773c..a3ae3b4b4813 100644
--- a/www/gitlab-pages/Makefile
+++ b/www/gitlab-pages/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitlab-pages
-PORTVERSION= 17.0.3
+PORTVERSION= 17.1.0
DISTVERSIONPREFIX= v
CATEGORIES= www
MASTER_SITES+= https://gitlab.com/gitlab-org/gitlab-pages/-/raw/v${DISTVERSION}/
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
index bfc0c69a9ac1..4464503182bb 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1719464143
-SHA256 (go/www_gitlab-pages/gitlab-pages-v17.0.3/go.mod) = de0926d06d56e5cdb84c2c4fd4bc05bb9c8c3724a8e1cf8c0f775856958540ba
-SIZE (go/www_gitlab-pages/gitlab-pages-v17.0.3/go.mod) = 3328
-SHA256 (go/www_gitlab-pages/gitlab-pages-v17.0.3/gitlab-pages-v17.0.3.tar.bz2) = 627832265e88232e90b96371d54c0f3576dc46c3373f0765abad55a119634f19
-SIZE (go/www_gitlab-pages/gitlab-pages-v17.0.3/gitlab-pages-v17.0.3.tar.bz2) = 212546
+TIMESTAMP = 1718793262
+SHA256 (go/www_gitlab-pages/gitlab-pages-v17.1.0/go.mod) = dc647bef3c9a1eb596f949dd6bdaee81bc6a791f8a4ad6f34e5e09b13c0e0350
+SIZE (go/www_gitlab-pages/gitlab-pages-v17.1.0/go.mod) = 3269
+SHA256 (go/www_gitlab-pages/gitlab-pages-v17.1.0/gitlab-pages-v17.1.0.tar.bz2) = 55a09929ec5659267396cc9dbe413720739fe1554f018f77dbc60ddb246c7cf5
+SIZE (go/www_gitlab-pages/gitlab-pages-v17.1.0/gitlab-pages-v17.1.0.tar.bz2) = 218472
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index 044eea483afd..984b34ba3e0d 100644
--- a/www/gitlab-workhorse/Makefile
+++ b/www/gitlab-workhorse/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitlab-workhorse
-PORTVERSION= 17.0.3
+PORTVERSION= 17.1.0
DISTVERSIONPREFIX= v
CATEGORIES= www
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index 31b15910238a..fea57c4c61e0 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1719464134
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.0.3/go.mod) = 01accf76d651c177faba180d5d544c1509d3af644af5acb5a7c40268b744f99e
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.0.3/go.mod) = 7030
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.0.3/gitlab-foss-v17.0.3.tar.bz2) = b737dc41b8ce3dcf0215130cd0bf47676ef1730fe26353b1d43aae75d4d8697b
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.0.3/gitlab-foss-v17.0.3.tar.bz2) = 103832023
+TIMESTAMP = 1718793205
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.1.0/go.mod) = eb2321aa5993d64f24051d87d4ffd701d2054c1084e55af4ec654a289e2dba95
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.1.0/go.mod) = 6994
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.1.0/gitlab-foss-v17.1.0.tar.bz2) = 3f85ff78b83d2bed3fd7bcf205e13b5361d5979fc9c805c579a5eb06471614b5
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.1.0/gitlab-foss-v17.1.0.tar.bz2) = 106374768
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index 6e814b595792..e6d6b884c14e 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitlab-${FLAVOR:Uce}
-PORTVERSION= 17.0.3
+PORTVERSION= 17.1.0
DISTVERSIONPREFIX= v
.if ${FLAVOR:U} == ee
DISTVERSIONSUFFIX= -ee
@@ -13,7 +13,8 @@ CATEGORIES= www devel
MAINTAINER= mfechner@FreeBSD.org
COMMENT= Web GUI for managing git repositories
-WWW= https://gitlab.com/
+WWW= https://gitlab.com/ \
+ https://gitlab.com/gitlab-org/gitlab
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
@@ -27,10 +28,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
# mail/rubygem-net-pop is required as ruby 3.1 removed it
MY_DEPENDS= git>=2.41.0:devel/git \
gitaly>=${PORTVERSION}:devel/gitaly \
- gitlab-elasticsearch-indexer>=4.8.0:textproc/gitlab-elasticsearch-indexer \
+ gitlab-elasticsearch-indexer>=5.0.0:textproc/gitlab-elasticsearch-indexer \
gitlab-agent>=${PORTVERSION}:net/gitlab-agent \
gitlab-pages>=${PORTVERSION}:www/gitlab-pages \
- gitlab-shell>=14.35.0:devel/gitlab-shell \
+ gitlab-shell>=14.36.0:devel/gitlab-shell \
gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \
redis>=6.2.11:databases/redis \
yarn${NODEJS_SUFFIX}>=1.10.0:www/yarn${NODEJS_SUFFIX} \
@@ -39,7 +40,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-net-smtp>=0:mail/rubygem-net-smtp \
rubygem-net-pop>=0:mail/rubygem-net-pop \
rubygem-psych3>=3.1<4:textproc/rubygem-psych3 \
- rubygem-rails70>=7.0.8.1<7.1:www/rubygem-rails70 \
+ rubygem-rails70>=7.0.8.4<7.1:www/rubygem-rails70 \
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 \
@@ -47,11 +48,12 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-sprockets3>=3.7<3.8:devel/rubygem-sprockets3 \
rubygem-view_component-rails70>=3.12.1<3.13:devel/rubygem-view_component-rails70 \
rubygem-pg>=1.5.6<1.6:databases/rubygem-pg \
- rubygem-neighbor>=0.2.3<0.3:databases/rubygem-neighbor \
+ rubygem-neighbor>=0.3.2<0.4:databases/rubygem-neighbor \
rubygem-rugged>=1.6<2:devel/rubygem-rugged \
rubygem-faraday1>=1.10.0<3:www/rubygem-faraday1 \
rubygem-marginalia>=1.11.1<1.12:databases/rubygem-marginalia \
rubygem-declarative_policy>=1.1.0<1.2:security/rubygem-declarative_policy \
+ rubygem-coverband>=6.1.2<6.2:www/rubygem-coverband \
rubygem-devise-rails70>=4.9.3<4.10:devel/rubygem-devise-rails70 \
rubygem-bcrypt>=3.1.14<3.2:security/rubygem-bcrypt \
rubygem-doorkeeper-rails70>=5.6.6<6:security/rubygem-doorkeeper-rails70 \
@@ -88,14 +90,14 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-net-ldap017>=0.17.1<0.18:net/rubygem-net-ldap017 \
rubygem-grape20>=2.0.0<2.1:devel/rubygem-grape20 \
rubygem-grape-entity>=1.0.1<1.1,1:devel/rubygem-grape-entity \
- rubygem-grape-swagger20>=2.0.2<2.1:devel/rubygem-grape-swagger20 \
+ rubygem-grape-swagger>=2.1.0<2.2:devel/rubygem-grape-swagger \
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.2<2.4:devel/rubygem-graphql \
+ rubygem-graphql>=2.3.4<2.4: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-apollo_upload_server>=2.1.6<2.2:net/rubygem-apollo_upload_server \
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 \
@@ -128,9 +130,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-api713>=7.13.3<7.13.4:textproc/rubygem-elasticsearch-api713 \
- rubygem-aws-sdk-core>=3.194.2<4:devel/rubygem-aws-sdk-core \
+ rubygem-aws-sdk-core>=3.197.0<4:devel/rubygem-aws-sdk-core \
rubygem-aws-sdk-cloudformation>=1<2:devel/rubygem-aws-sdk-cloudformation \
- rubygem-aws-sdk-s3>=1.149.1<2:devel/rubygem-aws-sdk-s3 \
+ rubygem-aws-sdk-s3>=1.151.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 \
@@ -149,7 +151,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-rouge42>=4.2.0<4.3:textproc/rubygem-rouge42 \
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.16<0.1:textproc/rubygem-gitlab-glfm-markdown \
+ rubygem-gitlab-glfm-markdown>=0.0.17<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.1,3<2.3,3:www/rubygem-rack22 \
@@ -165,7 +167,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \
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_dialects2>=2.0.2<3:devel/rubygem-semver_dialects2 \
+ rubygem-semver_dialects>=3.0<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 \
@@ -199,7 +201,7 @@ 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.4<3:devel/rubygem-gitlab-license \
+ 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.17.3<5.18:devel/rubygem-sentry-ruby \
rubygem-sentry-rails>=5.17.3<5.18:devel/rubygem-sentry-rails \
@@ -258,7 +260,7 @@ 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>=${PORTVERSION}:net/rubygem-gitaly \
+ rubygem-gitaly>=17.0.1:net/rubygem-gitaly \
rubygem-kas-grpc>=0.5.0,1<0.6.0,1:net/rubygem-kas-grpc \
rubygem-grpc>=1.63.0<2:net/rubygem-grpc \
rubygem-google-protobuf>=3.25.3<4:devel/rubygem-google-protobuf \
@@ -288,7 +290,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-ipaddress>=0.8.3<0.9:net/rubygem-ipaddress \
rubygem-parslet1>=1.8<2:textproc/rubygem-parslet1 \
rubygem-ed25519>=1.3.0<1.4:security/rubygem-ed25519 \
- rubygem-parser>=3.2.2.4:devel/rubygem-parser \
+ 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 \
@@ -296,7 +298,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \
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-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-google-cloud-profiler-v2>=0.3<1:textproc/rubygem-google-cloud-profiler-v2 \
@@ -330,6 +332,7 @@ 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 \
@@ -368,8 +371,15 @@ post-patch:
do-install:
${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample
- (cd ${WRKSRC} && ${RM} Gemfile.lock && bundle install --local)
+ # TODO: Vendored gems are installing binaries not into STAGEDIR, this needs to be fixed.
+ # As intermediate solution, the binaries are not disabled by patches
+ #(cd ${WRKSRC} && ${RM} Gemfile.lock && bundle config set path ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER} && ${WRK_ENV} ${GEM_ENV} bundle install --local)
+ (cd ${WRKSRC} && ${RM} Gemfile.lock && ${WRK_ENV} ${GEM_ENV} bundle install --local --binstubs=${WRKSRC}/.bin)
+ (cd ${WRKSRC} && bundle binstubs --path ${WRKSRC}/.bin --all)
${RM} -R ${WRKSRC}/workhorse
+ # remove vendored sidekiq gem as it breaks gitlab 17.1.0 for FreeBSD
+ # See also: https://gitlab.com/gitlab-org/gitlab/-/issues/468435
+ ${RM} -R ${WRKSRC}/vendor/gems/sidekiq-7.1.6
${FIND} ${WRKSRC} -name '*.orig' -delete
${FIND} ${WRKSRC} -name '*.bak' -delete
${FIND} ${WRKSRC} -name '*.gitkeep' -delete
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index 8cf87a83428c..f783044c5bd5 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1719464037
-SHA256 (gitlab-foss-v17.0.3.tar.bz2) = b737dc41b8ce3dcf0215130cd0bf47676ef1730fe26353b1d43aae75d4d8697b
-SIZE (gitlab-foss-v17.0.3.tar.bz2) = 103832023
-TIMESTAMP = 1719464091
-SHA256 (gitlab-v17.0.3-ee.tar.bz2) = 833dc7e676d7c3e2e762c1277dfe1137c221746c02d5a30c2ba638e7afdbbb8b
-SIZE (gitlab-v17.0.3-ee.tar.bz2) = 111412890
+TIMESTAMP = 1718791024
+SHA256 (gitlab-foss-v17.1.0.tar.bz2) = 3f85ff78b83d2bed3fd7bcf205e13b5361d5979fc9c805c579a5eb06471614b5
+SIZE (gitlab-foss-v17.1.0.tar.bz2) = 106374768
+TIMESTAMP = 1718791076
+SHA256 (gitlab-v17.1.0-ee.tar.bz2) = e3eec07dc8a9277b45ba193d3a3711adb4cca8b376b356e0028dd7f6ab2d57aa
+SIZE (gitlab-v17.1.0-ee.tar.bz2) = 114925370
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index cb36ba55d06e..22b05c6010b3 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig 2024-05-15 08:00:50 UTC
+--- Gemfile.orig 2024-06-19 08:46:16 UTC
+++ Gemfile
@@ -58,7 +58,7 @@ gem 'rugged', '~> 1.6' # rubocop:todo Gemfile/MissingF
@@ -9,7 +9,7 @@
gem 'marginalia', '~> 1.11.1' # rubocop:todo Gemfile/MissingFeatureCategory
# Authorization
-@@ -76,7 +76,7 @@ gem 'omniauth-alicloud', '~> 3.0.0' # rubocop:todo Gem
+@@ -79,7 +79,7 @@ gem 'omniauth-alicloud', '~> 3.0.0' # rubocop:todo Gem
gem 'omniauth-auth0', '~> 3.1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'omniauth-azure-activedirectory-v2', '~> 2.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'omniauth-alicloud', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -18,7 +18,7 @@
gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md # rubocop:todo Gemfile/MissingFeatureCategory
gem 'omniauth-google-oauth2', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'omniauth-oauth2-generic', '~> 0.2.2' # rubocop:todo Gemfile/MissingFeatureCategory
-@@ -86,7 +86,7 @@ gem 'omniauth_openid_connect', '~> 0.6.1' # rubocop:to
+@@ -89,7 +89,7 @@ gem 'omniauth_openid_connect', '~> 0.6.1' # rubocop:to
gem 'omniauth_openid_connect', '~> 0.6.1' # rubocop:todo Gemfile/MissingFeatureCategory
# Locked until Ruby 3.0 upgrade since upgrading will pull in an updated net-smtp gem.
# See https://docs.gitlab.com/ee/development/emails.html#rationale.
@@ -27,7 +27,7 @@
gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md # rubocop:todo Gemfile/MissingFeatureCategory
gem 'omniauth-atlassian-oauth2', '~> 0.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'rack-oauth2', '~> 1.21.3' # rubocop:todo Gemfile/MissingFeatureCategory
-@@ -181,7 +181,7 @@ gem 'google-cloud-storage', '~> 1.45.0' # rubocop:todo
+@@ -184,7 +184,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
@@ -36,7 +36,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
-@@ -192,7 +192,7 @@ gem 'google-apis-androidpublisher_v3', '~> 0.34.0' # r
+@@ -195,7 +195,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
@@ -45,19 +45,19 @@
gem 'google-cloud-artifact_registry-v1', '~> 0.11.0', feature_category: :shared
gem 'google-cloud-compute-v1', '~> 2.6.0', feature_category: :shared
-@@ -203,9 +203,9 @@ gem 'elasticsearch-api', '7.13.3' # rubocop:todo Gem
+@@ -206,9 +206,9 @@ gem 'elasticsearch-api', '7.13.3' # rubocop:todo Gem
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.194.2' # rubocop:todo Gemfile/MissingFeatureCategory
-+gem 'aws-sdk-core', '~> 3.194' # rubocop:todo Gemfile/MissingFeatureCategory
+-gem 'aws-sdk-core', '~> 3.197.0' # rubocop:todo Gemfile/MissingFeatureCategory
++gem 'aws-sdk-core', '~> 3.197' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory
--gem 'aws-sdk-s3', '~> 1.149.1' # rubocop:todo Gemfile/MissingFeatureCategory
-+gem 'aws-sdk-s3', '~> 1.149' # rubocop:todo Gemfile/MissingFeatureCategory
+-gem 'aws-sdk-s3', '~> 1.151.0' # rubocop:todo Gemfile/MissingFeatureCategory
++gem 'aws-sdk-s3', '~> 1.151' # 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
-@@ -236,12 +236,12 @@ gem 'diff_match_patch', '~> 0.1.0', path: 'vendor/gems
+@@ -239,12 +239,12 @@ gem 'diff_match_patch', '~> 0.1.0', path: 'vendor/gems
gem 'diff_match_patch', '~> 0.1.0', path: 'vendor/gems/diff_match_patch', feature_category: :team_planning
# Application server
@@ -72,16 +72,16 @@
gem 'sd_notify', '~> 0.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
end
-@@ -252,7 +252,7 @@ gem 'acts-as-taggable-on', '~> 10.0' # rubocop:todo Ge
+@@ -255,7 +255,7 @@ gem 'acts-as-taggable-on', '~> 10.0' # rubocop:todo Ge
gem 'acts-as-taggable-on', '~> 10.0' # rubocop:todo Gemfile/MissingFeatureCategory
# Background jobs
--gem 'sidekiq', path: 'vendor/gems/sidekiq-7.1.6', require: 'sidekiq' # rubocop:todo Gemfile/MissingFeatureCategory
-+gem 'sidekiq', '~> 7.1.6', require: 'sidekiq' # rubocop:todo Gemfile/MissingFeatureCategory
- 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
-
-@@ -425,95 +425,10 @@ gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/Missi
+-gem 'sidekiq', path: 'vendor/gems/sidekiq-7.1.6', require: 'sidekiq', feature_category: :scalability
++gem 'sidekiq', '~>7.1.6', feature_category: :scalability
+ gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability
+ gem 'gitlab-sidekiq-fetcher',
+ path: 'vendor/gems/sidekiq-reliable-fetch',
+@@ -431,96 +431,10 @@ gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/Missi
gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
@@ -100,19 +100,20 @@
-
- gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory
-
-- gem 'ruby-lsp', "~> 0.16.6", require: false, feature_category: :tooling
+- gem 'ruby-lsp', "~> 0.16.7", require: false, feature_category: :tooling
-
-- gem 'ruby-lsp-rails', "~> 0.3.3", 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', require: 'toogle', feature_category: :tooling
+- gem 'gdk-toogle', '~> 0.9', '>= 0.9.5', require: 'toogle', feature_category: :tooling
-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 'parser', '~> 3.3', '>= 3.3.0.5' # rubocop:todo Gemfile/MissingFeatureCategory
+- # Locked on 3.3.0.5 until inspec-core is updated in Omnibus: https://github.com/inspec/inspec/pull/7030
+- gem 'parser', '= 3.3.0.5', 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
@@ -120,8 +121,8 @@
- gem 'awesome_print', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-
- gem 'database_cleaner-active_record', '~> 2.1.0', feature_category: :database
-- gem 'factory_bot_rails', '~> 6.4.3' # rubocop:todo Gemfile/MissingFeatureCategory
- gem 'rspec-rails', '~> 6.1.1', 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
@@ -129,8 +130,8 @@
- gem 'spring', '~> 4.1.0' # rubocop:todo Gemfile/MissingFeatureCategory
- gem 'spring-commands-rspec', '~> 1.0.4' # rubocop:todo Gemfile/MissingFeatureCategory
-
-- gem 'gitlab-styles', '~> 11.0.0', feature_category: :tooling
-- gem 'haml_lint', '~> 0.57', feature_category: :tooling
+- gem 'gitlab-styles', '~> 12.0.1', feature_category: :tooling
+- gem 'haml_lint', '~> 0.58', feature_category: :tooling
-
- gem 'bundler-audit', '~> 0.9.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-
@@ -139,7 +140,7 @@
- gem 'benchmark-memory', '~> 0.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-
- # Profiling data from CI/CD pipelines
-- gem 'influxdb-client', '~> 2.9', require: false # rubocop:todo Gemfile/MissingFeatureCategory
+- gem 'influxdb-client', '~> 3.1', require: false, feature_category: :tooling
-
- gem 'knapsack', '~> 1.22.0', feature_category: :tooling
- gem 'crystalball', '~> 0.7.0', require: false, feature_category: :tooling
@@ -177,7 +178,7 @@
# Gems required in omnibus-gitlab pipeline
group :development, :test, :omnibus do
gem 'license_finder', '~> 7.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
-@@ -525,36 +440,6 @@ end
+@@ -532,36 +446,6 @@ end
gem 'gitlab-rspec_flaky', path: 'gems/gitlab-rspec_flaky', feature_category: :tooling
end
@@ -186,12 +187,12 @@
- 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
-- gem 'rspec-parameterized', '~> 1.0', require: false, feature_category: :tooling
+- 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.19' # rubocop:todo Gemfile/MissingFeatureCategory
+- gem 'selenium-webdriver', '~> 4.21', '>= 4.21.1' # rubocop:todo Gemfile/MissingFeatureCategory
-
- gem 'graphlyte', '~> 1.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
-
@@ -208,13 +209,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.24.0', require: false, feature_category: :tooling
+- gem 'gitlab_quality-test_tooling', '~> 1.28.0', require: false, feature_category: :tooling
-end
-
gem 'octokit', '~> 8.1', feature_category: :importers
gem 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :shared
-@@ -613,7 +498,7 @@ gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfil
+@@ -620,7 +504,7 @@ gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfil
gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfile/MissingFeatureCategory
# Countries list
@@ -223,16 +224,16 @@
gem 'retriable', '~> 3.1.2' # rubocop:todo Gemfile/MissingFeatureCategory
-@@ -679,6 +564,7 @@ gem 'telesignenterprise', '~> 2.2' # rubocop:todo Gemf
+@@ -686,6 +570,7 @@ gem 'telesignenterprise', '~> 2.2' # rubocop:todo Gemf
gem 'telesignenterprise', '~> 2.2' # rubocop:todo Gemfile/MissingFeatureCategory
# BufferedIO patch
+
# Updating this version will require updating scripts/allowed_warnings.txt
gem 'net-protocol', '~> 0.1.3' # rubocop:todo Gemfile/MissingFeatureCategory
- # Lock this until we make DNS rebinding work with the updated net-http:
-@@ -686,5 +572,11 @@ gem 'duo_api', '~> 1.3' # rubocop:todo Gemfile/Missing
- gem 'net-http', '= 0.1.1' # rubocop:todo Gemfile/MissingFeatureCategory
+
+@@ -694,5 +579,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 15a9fb52c93c..12cde10c5a15 100644
--- a/www/gitlab/files/patch-config_gitlab.yml.example
+++ b/www/gitlab/files/patch-config_gitlab.yml.example
@@ -1,6 +1,6 @@
---- config/gitlab.yml.example.orig 2024-05-15 08:00:50 UTC
+--- config/gitlab.yml.example.orig 2024-06-19 08:46:16 UTC
+++ config/gitlab.yml.example
-@@ -463,7 +463,7 @@ production: &base
+@@ -472,7 +472,7 @@ production: &base
## GitLab Pages
pages:
enabled: false
@@ -9,7 +9,7 @@
# The location where pages are stored (default: shared/pages).
# path: shared/pages
-@@ -473,9 +473,9 @@ production: &base
+@@ -482,9 +482,9 @@ production: &base
host: example.com
port: 80 # Set to 443 if you serve the pages with HTTPS
https: false # Set to true if you serve the pages with HTTPS
@@ -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).
-@@ -1200,13 +1200,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
-@@ -1241,12 +1241,12 @@ production: &base
+@@ -1250,12 +1250,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@@ -54,14 +54,16 @@
# Git over HTTP
upload_pack: true
-@@ -1261,13 +1261,13 @@ production: &base
+@@ -1270,7 +1270,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).
- # secret_file: /home/git/gitlab/.gitlab_workhorse_secret
+ # secret_file: %%WWWDIR%%/.gitlab_workhorse_secret
- gitlab_kas:
+ topology_service:
+ # enabled: false
+@@ -1286,7 +1286,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).
@@ -70,7 +72,7 @@
# The URL to the external KAS API (used by the Kubernetes agents)
# external_url: wss://kas.example.com
-@@ -1291,13 +1291,13 @@ production: &base
+@@ -1310,13 +1310,13 @@ production: &base
## GitLab Elasticsearch settings
elasticsearch:
@@ -86,7 +88,7 @@
## Webpack settings
# If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
-@@ -1318,18 +1318,18 @@ production: &base
+@@ -1337,18 +1337,18 @@ production: &base
# Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq.
sidekiq_exporter:
@@ -112,7 +114,7 @@
# Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma.
web_exporter:
-@@ -1556,13 +1556,13 @@ test:
+@@ -1575,13 +1575,13 @@ test:
gitaly_address: unix:tmp/tests/gitaly/praefect.socket
gitaly:
diff --git a/www/gitlab/files/patch-config_initializers_1__settings.rb b/www/gitlab/files/patch-config_initializers_1__settings.rb
index 9d1d73bbf17c..34b11f279c55 100644
--- a/www/gitlab/files/patch-config_initializers_1__settings.rb
+++ b/www/gitlab/files/patch-config_initializers_1__settings.rb
@@ -1,6 +1,6 @@
---- config/initializers/1_settings.rb.orig 2023-11-15 09:14:25 UTC
+--- config/initializers/1_settings.rb.orig 2024-06-19 08:46:16 UTC
+++ config/initializers/1_settings.rb
-@@ -208,11 +208,7 @@ Settings.gitlab['url'] ||= Settings.__send__(:build_gi
+@@ -209,11 +209,7 @@ Settings.gitlab['ssh_user'] ||= Settings.gitlab.user
Settings.gitlab['user'] ||= 'git'
# External configuration may cause the ssh user to differ from the GitLab user
Settings.gitlab['ssh_user'] ||= Settings.gitlab.user
diff --git a/www/gitlab/files/patch-config_initializers_redis__client__patch.rb b/www/gitlab/files/patch-config_initializers_redis__client__patch.rb
deleted file mode 100644
index 6d90e4c483b1..000000000000
--- a/www/gitlab/files/patch-config_initializers_redis__client__patch.rb
+++ /dev/null
@@ -1,78 +0,0 @@
---- config/initializers/redis_client_patch.rb.orig 2024-05-30 08:36:06 UTC
-+++ config/initializers/redis_client_patch.rb
-@@ -1,75 +1,3 @@
- # frozen_string_literal: true
--
--require 'redis-client'
--
--# This patch can be dropped once https://github.com/redis-rb/redis-client/pull/197
--# is released and merged.
--if Gem::Version.new(RedisClient::VERSION) > Gem::Version.new('0.22.1') # rubocop:disable Style/GuardClause -- This is easier to read
-- raise 'New version of redis-client detected, please remove this file'
--end
--
--# rubocop:disable Gitlab/ModuleWithInstanceVariables -- This is an upstream gem
--# rubocop:disable Style/GuardClause -- This is an upstream gem
--class RedisClient
-- module ConnectionMixin
-- def call(command, timeout)
-- @pending_reads += 1
-- write(command)
-- result = read(connection_timeout(timeout))
-- @pending_reads -= 1
-- if result.is_a?(Error)
-- result._set_command(command)
-- result._set_config(config)
-- raise result
-- else
-- result
-- end
-- end
--
-- def call_pipelined(commands, timeouts, exception: true)
-- first_exception = nil
--
-- size = commands.size
-- results = Array.new(commands.size)
-- @pending_reads += size
-- write_multi(commands)
--
-- size.times do |index|
-- timeout = timeouts && timeouts[index]
-- result = read(connection_timeout(timeout))
-- @pending_reads -= 1
--
-- # A multi/exec command can return an array of results.
-- # An error from a multi/exec command is handled in Multi#_coerce!.
-- if result.is_a?(Array)
-- result.each do |res|
-- res._set_config(config) if res.is_a?(Error)
-- end
-- elsif result.is_a?(Error)
-- result._set_command(commands[index])
-- result._set_config(config)
-- first_exception ||= result
-- end
--
-- results[index] = result
-- end
--
-- if first_exception && exception
-- raise first_exception
-- else
-- results
-- end
-- end
--
-- def connection_timeout(timeout)
-- return timeout unless timeout && timeout > 0
--
-- # Can't use the command timeout argument as the connection timeout
-- # otherwise it would be very racy. So we add the regular read_timeout on top
-- # to account for the network delay.
-- timeout + config.read_timeout
-- end
-- end
--end
- # rubocop:enable Gitlab/ModuleWithInstanceVariables
- # rubocop:enable Style/GuardClause
diff --git a/www/gitlab/files/patch-vendor_gems_sidekiq-7.1.6_sidekiq.gemspec b/www/gitlab/files/patch-vendor_gems_sidekiq-7.1.6_sidekiq.gemspec
new file mode 100644
index 000000000000..7c2c18b9db64
--- /dev/null
+++ b/www/gitlab/files/patch-vendor_gems_sidekiq-7.1.6_sidekiq.gemspec
@@ -0,0 +1,11 @@
+--- vendor/gems/sidekiq-7.1.6/sidekiq.gemspec.orig 2024-06-20 13:48:56 UTC
++++ vendor/gems/sidekiq-7.1.6/sidekiq.gemspec
+@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
+ gem.homepage = "https://sidekiq.org"
+ gem.license = "LGPL-3.0"
+
+- gem.executables = ["sidekiq", "sidekiqmon"]
++# gem.executables = ["sidekiq", "sidekiqmon"]
+ gem.files = %w[
+ sidekiq.gemspec
+ README.md
diff --git a/www/gitlab/pkg-message b/www/gitlab/pkg-message
index edbd599c11e6..ac7a48bcf980 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.fechner.net/mfechner/Gitlab-docu/blob/master/install/17.0-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/17.1-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.11-17.0-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/17.0-17.1-freebsd.md
If you just installed an minor upgrade of GitLab please follow
the instructions in the guide at: