git: 5ac2ce78ae2e - main - www/gitlab: major upgrade to 18.1.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Matthias Fechner <mfechner_at_FreeBSD.org>
Date: Fri, 20 Jun 2025 03:59:24 UTC
The branch main has been updated by mfechner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5ac2ce78ae2ec46adedc5297f235460d62c9edc3

commit 5ac2ce78ae2ec46adedc5297f235460d62c9edc3
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2025-06-18 14:30:34 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2025-06-20 03:55:54 +0000

    www/gitlab: major upgrade to 18.1.0
    
    Changes:        https://about.gitlab.com/releases/2025/06/19/gitlab-18-1-released/
---
 devel/gitaly/distinfo                              | 14 ++--
 net/gitlab-agent/distinfo                          | 10 +--
 net/rubygem-gitaly/Makefile                        |  2 +-
 net/rubygem-gitaly/distinfo                        |  6 +-
 net/rubygem-gitlab-kas-grpc/distinfo               |  6 +-
 www/gitlab-pages/distinfo                          | 10 +--
 www/gitlab-workhorse/distinfo                      | 10 +--
 www/gitlab/Makefile                                | 81 +++++++++++-----------
 www/gitlab/Makefile.common                         |  2 +-
 www/gitlab/distinfo                                | 12 ++--
 www/gitlab/files/patch-Gemfile                     | 52 +++++---------
 www/gitlab/files/patch-config_gitlab.yml.example   | 31 +++------
 ...ems_gitlab-backup-cli_gitlab-backup-cli.gemspec |  9 +--
 www/gitlab/pkg-message                             |  4 +-
 14 files changed, 106 insertions(+), 143 deletions(-)

diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index 0bf1625ff4c3..32300810cbbf 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1749701579
-SHA256 (go/devel_gitaly/gitaly-v18.0.2/go.mod) = c01a366ef332898c1a1fd75281459c8d6caea4c59baa4dd4094fb26eb00d2a4b
-SIZE (go/devel_gitaly/gitaly-v18.0.2/go.mod) = 12814
-SHA256 (go/devel_gitaly/gitaly-v18.0.2/gitaly-v18.0.2.tar.bz2) = 7f4eff3ab925da6720d624dc30fe8213969db83ce09033cc5d692ef0a6dad75e
-SIZE (go/devel_gitaly/gitaly-v18.0.2/gitaly-v18.0.2.tar.bz2) = 4513486
-SHA256 (go/devel_gitaly/gitaly-v18.0.2/git-v2.49.0.tar.bz2) = 63678e3839f5af667b48cb9d0c37de4b249916dc19aae7c5ce83d07fb3146ecb
-SIZE (go/devel_gitaly/gitaly-v18.0.2/git-v2.49.0.tar.bz2) = 9079092
+TIMESTAMP = 1750221112
+SHA256 (go/devel_gitaly/gitaly-v18.1.0/go.mod) = c0924eaae5b6c66c0e8d04e25e1dad85b88be0d33008524c3e6a9eca51311dcb
+SIZE (go/devel_gitaly/gitaly-v18.1.0/go.mod) = 13011
+SHA256 (go/devel_gitaly/gitaly-v18.1.0/gitaly-v18.1.0.tar.bz2) = 2ad5012ef62f8c1d178476c72aef0c0621817f61804d1a03317171f2960b20be
+SIZE (go/devel_gitaly/gitaly-v18.1.0/gitaly-v18.1.0.tar.bz2) = 4542282
+SHA256 (go/devel_gitaly/gitaly-v18.1.0/git-v2.49.0.tar.bz2) = 63678e3839f5af667b48cb9d0c37de4b249916dc19aae7c5ce83d07fb3146ecb
+SIZE (go/devel_gitaly/gitaly-v18.1.0/git-v2.49.0.tar.bz2) = 9079092
diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo
index 7ec9860711e1..60ec29873bc3 100644
--- a/net/gitlab-agent/distinfo
+++ b/net/gitlab-agent/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1749701580
-SHA256 (go/net_gitlab-agent/gitlab-agent-v18.0.2/v18.0.2.mod) = 0c2121b2efd0904b758621ebeefb6d8ac0a504c59ec144b7b59fc05ab4a73ae8
-SIZE (go/net_gitlab-agent/gitlab-agent-v18.0.2/v18.0.2.mod) = 9417
-SHA256 (go/net_gitlab-agent/gitlab-agent-v18.0.2/v18.0.2.zip) = 0d48e03a24724593d9fece3e8df16d5d3ce9811ce1c8a9267748fe1dd0a4de2e
-SIZE (go/net_gitlab-agent/gitlab-agent-v18.0.2/v18.0.2.zip) = 1606177
+TIMESTAMP = 1750221131
+SHA256 (go/net_gitlab-agent/gitlab-agent-v18.1.0/v18.1.0.mod) = 2739a9f4b5204729b51ad90bd66634bab4c4a4f2db5a8f3ec80c7eda733484db
+SIZE (go/net_gitlab-agent/gitlab-agent-v18.1.0/v18.1.0.mod) = 9688
+SHA256 (go/net_gitlab-agent/gitlab-agent-v18.1.0/v18.1.0.zip) = faa4c72fd32e45b03bc8deb3472e57f0394afb879473bba23cb69718d3d30147
+SIZE (go/net_gitlab-agent/gitlab-agent-v18.1.0/v18.1.0.zip) = 1672534
diff --git a/net/rubygem-gitaly/Makefile b/net/rubygem-gitaly/Makefile
index 69a1289ab366..0b4ff68cc031 100644
--- a/net/rubygem-gitaly/Makefile
+++ b/net/rubygem-gitaly/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitaly
-PORTVERSION=	17.11.2
+PORTVERSION=	18.1.0
 CATEGORIES=	net rubygems
 MASTER_SITES=	RG
 
diff --git a/net/rubygem-gitaly/distinfo b/net/rubygem-gitaly/distinfo
index 5db3b4803d59..ebbf3d3cdf11 100644
--- a/net/rubygem-gitaly/distinfo
+++ b/net/rubygem-gitaly/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746705767
-SHA256 (rubygem/gitaly-17.11.2.gem) = 32266469296345187d16ab3cfa3da849338817987b722a46eed4309ee18f996e
-SIZE (rubygem/gitaly-17.11.2.gem) = 53248
+TIMESTAMP = 1750222113
+SHA256 (rubygem/gitaly-18.1.0.gem) = 80f8dd89005ad5788a7af07f101484c1b1dad423e90cc0405daaa85c27d1b7fc
+SIZE (rubygem/gitaly-18.1.0.gem) = 53248
diff --git a/net/rubygem-gitlab-kas-grpc/distinfo b/net/rubygem-gitlab-kas-grpc/distinfo
index ab5afafdf044..e6a9daab225a 100644
--- a/net/rubygem-gitlab-kas-grpc/distinfo
+++ b/net/rubygem-gitlab-kas-grpc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1749701595
-SHA256 (rubygem/gitlab-kas-grpc-18.0.2.gem) = b03aa7fc1108d62bc93eeebae26bccf780d9b226c846d6c7b6b82d7e8c84cf47
-SIZE (rubygem/gitlab-kas-grpc-18.0.2.gem) = 10752
+TIMESTAMP = 1750221154
+SHA256 (rubygem/gitlab-kas-grpc-18.1.0.gem) = 968f759fef8e6e3fa6a926dae58bb16698bdcd73a9f981f44074db31b692a51d
+SIZE (rubygem/gitlab-kas-grpc-18.1.0.gem) = 10752
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
index fd52eaa44969..a09d744a2925 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1749701582
-SHA256 (go/www_gitlab-pages/gitlab-pages-v18.0.2/go.mod) = 5d3bf245e8a23b85bf8d20e164da233946fce66407fc882c9eef3146a36bb266
-SIZE (go/www_gitlab-pages/gitlab-pages-v18.0.2/go.mod) = 3435
-SHA256 (go/www_gitlab-pages/gitlab-pages-v18.0.2/gitlab-pages-v18.0.2.tar.bz2) = 30151fcca821aeda40272b07a211cc8081f01481f2d9ff3041722a16fc45dad2
-SIZE (go/www_gitlab-pages/gitlab-pages-v18.0.2/gitlab-pages-v18.0.2.tar.bz2) = 234204
+TIMESTAMP = 1750221135
+SHA256 (go/www_gitlab-pages/gitlab-pages-v18.1.0/go.mod) = a5b3bb24fd3351af28849dfc2bb09acd9d7f4d06e3f065776685482d0745e180
+SIZE (go/www_gitlab-pages/gitlab-pages-v18.1.0/go.mod) = 3435
+SHA256 (go/www_gitlab-pages/gitlab-pages-v18.1.0/gitlab-pages-v18.1.0.tar.bz2) = 4e8195b3eb25f816928f0ec1d858736eb7f18771ebacd825721fbf450cd1eaba
+SIZE (go/www_gitlab-pages/gitlab-pages-v18.1.0/gitlab-pages-v18.1.0.tar.bz2) = 235637
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index d7aab65213ba..035a90fe649f 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1749701594
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.0.2/go.mod) = 8dbcbe08dbde6db18015e8e2cd84a67a5da908501eb5d6c6d7111fe2e63d27c6
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.0.2/go.mod) = 9144
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.0.2/gitlab-foss-v18.0.2.tar.bz2) = f1f1913ddc308cc26ecc1d8942d81a99cecca220da565c7e915307af790c17e3
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.0.2/gitlab-foss-v18.0.2.tar.bz2) = 116957164
+TIMESTAMP = 1750221154
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.1.0/go.mod) = ba6f1d47b9d8b718a588b1de93d521341655934b0d8038a32777a34d97168804
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.1.0/go.mod) = 9144
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.1.0/gitlab-foss-v18.1.0.tar.bz2) = 5c909d712494ff50ab1a15abef760388fea062fbb9204e54d0fcf5a28402dbb6
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.1.0/gitlab-foss-v18.1.0.tar.bz2) = 119446403
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index c51d85bb5b99..8db1cc48aeb4 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -45,19 +45,19 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-rails-gitlab>=7.1.5.1<7.2:www/rubygem-rails-gitlab \
 	rubygem-mutex_m>=0.3<1:devel/rubygem-mutex_m \
 	rubygem-drb>=2.2.1<3:devel/rubygem-drb \
-	rubygem-bootsnap>=1.18.3<1.19:devel/rubygem-bootsnap \
-	rubygem-ffi>=1.17.1<2:devel/rubygem-ffi \
+	rubygem-bootsnap>=1.18.6<1.19:devel/rubygem-bootsnap \
+	rubygem-ffi>=1.17.2<2:devel/rubygem-ffi \
 	rubygem-openssl>=3.2.0<4:security/rubygem-openssl \
-	rubygem-gitlab-secret_detection>=0.23.0<1:security/rubygem-gitlab-secret_detection \
+	rubygem-gitlab-secret_detection>=0.29.1<1:security/rubygem-gitlab-secret_detection \
 	rubygem-responders-rails-gitlab>=3.0<4.0:www/rubygem-responders-rails-gitlab \
-	rubygem-sprockets3>=3.7.0<3.8:devel/rubygem-sprockets3 \
+	rubygem-sprockets-gitlab>=3.7.0<3.8:devel/rubygem-sprockets-gitlab \
 	rubygem-sprockets-rails-rails-gitlab>=3.5.2<3.6:devel/rubygem-sprockets-rails-rails-gitlab \
-	rubygem-view_component-rails-gitlab>=3.21.0<3.22:devel/rubygem-view_component-rails-gitlab \
+	rubygem-view_component-rails-gitlab>=3.23.2<3.24:devel/rubygem-view_component-rails-gitlab \
 	rubygem-pg>=1.5.9<1.6:databases/rubygem-pg \
 	rubygem-rugged>=1.6<2:devel/rubygem-rugged \
-	rubygem-faraday-gitlab>=2<3:www/rubygem-faraday-gitlab \
+	rubygem-faraday-gitlab>=2.13.1<3:www/rubygem-faraday-gitlab \
 	rubygem-faraday-retry-gitlab>=2<3:www/rubygem-faraday-retry-gitlab \
-	rubygem-logger-gitlab>=1.6.0<1.7:devel/rubygem-logger-gitlab \
+	rubygem-logger-gitlab>=1.7.0<1.8:devel/rubygem-logger-gitlab \
 	rubygem-marginalia>=1.11.1<1.12:databases/rubygem-marginalia \
 	rubygem-declarative_policy>=1.1.0<1.2:security/rubygem-declarative_policy \
 	rubygem-coverband>=6.1.5<6.1.6:www/rubygem-coverband \
@@ -88,8 +88,9 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-invisible_captcha>=2.1.0<2.2.0:graphics/rubygem-invisible_captcha \
 	rubygem-devise-two-factor-rails-gitlab>=4.1.1<4.2:security/rubygem-devise-two-factor-rails-gitlab \
 	rubygem-rqrcode-gitlab>=2.2.0<3:www/rubygem-rqrcode-gitlab \
-	rubygem-validates_hostname>=1.0.13<1.1.0:dns/rubygem-validates_hostname \
-	rubygem-rubyzip>=2.3.2<2.4:archivers/rubygem-rubyzip \
+	rubygem-attr_encrypted>=4.2<5:security/rubygem-attr_encrypted \
+	rubygem-validates_hostname-gitlab>=1.0.13<1.1.0:dns/rubygem-validates_hostname-gitlab \
+	rubygem-rubyzip-gitlab>=2.4.1<2.5:archivers/rubygem-rubyzip-gitlab \
 	rubygem-acme-client-gitlab>=2.0.21<3:security/rubygem-acme-client-gitlab \
 	rubygem-browser5>=5.3.1<5.4:www/rubygem-browser5 \
 	rubygem-ohai>=18.1.18<19:sysutils/rubygem-ohai \
@@ -108,14 +109,14 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-hashie>=5.0.0<5.1:devel/rubygem-hashie \
 	rubygem-kaminari-rails-gitlab>=1.2.2<1.3:www/rubygem-kaminari-rails-gitlab \
 	rubygem-hamlit>=2.15.0<2.16:www/rubygem-hamlit \
-	rubygem-carrierwave1>=1.3.4<2.0:www/rubygem-carrierwave1 \
+	rubygem-carrierwave-gitlab>=1.3.4<2.0:www/rubygem-carrierwave-gitlab \
 	rubygem-mini_magick4>=4.12<5:graphics/rubygem-mini_magick4 \
 	rubygem-prawn>=0:print/rubygem-prawn \
 	rubygem-prawn-svg>=0:print/rubygem-prawn-svg \
-	rubygem-fog-aws328>=3.26<4:net/rubygem-fog-aws328 \
-	rubygem-fog-core210>=2.1.0<2.1.1:devel/rubygem-fog-core210 \
+	rubygem-fog-aws-gitlab>=3.26<4:net/rubygem-fog-aws-gitlab \
+	rubygem-fog-core-gitlab>=2.1.0<2.1.1:devel/rubygem-fog-core-gitlab \
 	rubygem-fog-google-gitlab>=1.24.1<1.25:net/rubygem-fog-google-gitlab \
-	rubygem-fog-local>=0.8<1.0:net/rubygem-fog-local \
+	rubygem-fog-local-gitlab>=0.8<1.0:net/rubygem-fog-local-gitlab \
 	rubygem-fog-aliyun-gitlab>=0.4<1.0:net/rubygem-fog-aliyun-gitlab \
 	rubygem-gitlab-fog-azure-rm>=2.2.0<2.3:net/rubygem-gitlab-fog-azure-rm \
 	rubygem-google-apis-storage_v1-gitlab>=0.29<1:devel/rubygem-google-apis-storage_v1-gitlab \
@@ -133,18 +134,18 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-googleauth-gitlab>=1.8.1<2:security/rubygem-googleauth-gitlab \
 	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.9<2.4.0:databases/rubygem-seed-fu \
+	rubygem-seed-fu-gitlab>=2.3.9<2.4.0:databases/rubygem-seed-fu-gitlab \
 	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.223.0<3.224: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.185.0<1.186:devel/rubygem-aws-sdk-s3-gitlab \
+	rubygem-aws-sdk-core-gitlab>=3.225.0<3.226:devel/rubygem-aws-sdk-core-gitlab \
+	rubygem-aws-sdk-cloudformation-gitlab>=1.131<2:devel/rubygem-aws-sdk-cloudformation-gitlab \
+	rubygem-aws-sdk-s3-gitlab>=1.189.0<1.190: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 \
-	rubygem-html-pipeline>=2.14.3<2.15:textproc/rubygem-html-pipeline \
-	rubygem-deckar01-task_list>=2.3.4<2.4:www/rubygem-deckar01-task_list \
+	rubygem-html-pipeline-gitlab>=2.14.3<2.15:textproc/rubygem-html-pipeline-gitlab \
+	rubygem-deckar01-task_list-gitlab>=2.3.4<2.4:www/rubygem-deckar01-task_list-gitlab \
 	rubygem-gitlab-markup>=2.0.0<2.1:textproc/rubygem-gitlab-markup \
 	rubygem-commonmarker0>=0.23.10<0.24:textproc/rubygem-commonmarker0 \
 	rubygem-kramdown-gitlab>=2.5.1<2.6:textproc/rubygem-kramdown-gitlab \
@@ -156,35 +157,35 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-asciidoctor-include-ext>=0.4.0<0.5.0:textproc/rubygem-asciidoctor-include-ext \
 	rubygem-asciidoctor-plantuml00>=0.0.16<0.1:textproc/rubygem-asciidoctor-plantuml00 \
 	rubygem-asciidoctor-kroki>=0.10.0<0.11:textproc/rubygem-asciidoctor-kroki \
-	rubygem-rouge-gitlab>=4.5.1<4.6:textproc/rubygem-rouge-gitlab \
+	rubygem-rouge-gitlab>=4.5.2<4.6:textproc/rubygem-rouge-gitlab \
 	rubygem-truncato>=0.7.13<0.8.0:textproc/rubygem-truncato \
 	rubygem-nokogiri>=1.18.7<2:textproc/rubygem-nokogiri \
-	rubygem-gitlab-glfm-markdown>=0.0.30<0.1:textproc/rubygem-gitlab-glfm-markdown \
+	rubygem-gitlab-glfm-markdown>=0.0.31<0.1:textproc/rubygem-gitlab-glfm-markdown \
 	rubygem-tanuki_emoji>=0.13<1:graphics/rubygem-tanuki_emoji \
 	rubygem-unicode-emoji>=4.0.4<5:devel/rubygem-unicode-emoji \
 	rubygem-icalendar-gitlab>=2.10.3<2.11:devel/rubygem-icalendar-gitlab \
-	rubygem-diffy>=3.4<4:textproc/rubygem-diffy \
+	rubygem-diffy>=3.4.4<4:textproc/rubygem-diffy \
 	rubygem-rack22>=2.2.13,3<2.3,3:www/rubygem-rack22 \
 	rubygem-rack-timeout>=0.7.0<0.8:www/rubygem-rack-timeout \
-	rubygem-puma>=6.5.0<7:www/rubygem-puma \
+	rubygem-puma>=6.6.0<6.6.1:www/rubygem-puma \
 	rubygem-sd_notify>=0.1.1<0.2:devel/rubygem-sd_notify \
-	rubygem-state_machines-activerecord08>=0.8.0<0.9.0:databases/rubygem-state_machines-activerecord08 \
+	rubygem-state_machines-activerecord-gitlab>=0.8.0<0.9.0:databases/rubygem-state_machines-activerecord-gitlab \
 	rubygem-sidekiq-gitlab>=7.3.9:devel/rubygem-sidekiq-gitlab \
 	rubygem-sidekiq-cron-rails-gitlab>=1.12.0<1.13:devel/rubygem-sidekiq-cron-rails-gitlab \
 	rubygem-fugit>=1.11.1<1.12:devel/rubygem-fugit \
-	rubygem-httparty-gitlab>=0.22.0<0.23:www/rubygem-httparty-gitlab \
+	rubygem-httparty-gitlab>=0.23.0<0.24:www/rubygem-httparty-gitlab \
 	rubygem-rainbow>=3.1.1<4.0:devel/rubygem-rainbow \
 	rubygem-ruby-progressbar>=1.11<2:devel/rubygem-ruby-progressbar \
 	rubygem-re2>=2.15.0<3:devel/rubygem-re2 \
 	rubygem-semver_dialects>=3.7.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 \
+	rubygem-device_detector>=1.1.3:devel/rubygem-device_detector \
 	rubygem-redis>=5.4.0<5.5:databases/rubygem-redis \
 	rubygem-redis-clustering>=5.4.0<5.5:databases/rubygem-redis-clustering \
-	rubygem-connection_pool>=2.5.0<3.0:net/rubygem-connection_pool \
+	rubygem-connection_pool>=2.5.3<2.6:net/rubygem-connection_pool \
 	rubygem-redis-actionpack-rails-gitlab>=5.5.0<5.6:databases/rubygem-redis-actionpack-rails-gitlab \
-	rubygem-jira-ruby>=2.3.0<2.4:devel/rubygem-jira-ruby \
+	rubygem-jira-ruby-gitlab>=2.3.0<2.4:devel/rubygem-jira-ruby-gitlab \
 	rubygem-atlassian-jwt>=0.2.1<0.3.0:www/rubygem-atlassian-jwt \
 	rubygem-slack-messenger>=2.3.5<2.4.0:devel/rubygem-slack-messenger \
 	rubygem-ruby-fogbugz>=0.3.0<0.4.0:devel/rubygem-ruby-fogbugz \
@@ -193,7 +194,7 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-circuitbox>=2.0.0<2.1:www/rubygem-circuitbox \
 	rubygem-sanitize60>=6.0.2<6.1:textproc/rubygem-sanitize60 \
 	rubygem-babosa>=2.0<3:textproc/rubygem-babosa \
-	rubygem-loofah>=2.24.0<2.25:textproc/rubygem-loofah \
+	rubygem-loofah>=2.24.1<2.25:textproc/rubygem-loofah \
 	rubygem-licensee-gitlab>=9.16<10:devel/rubygem-licensee-gitlab \
 	rubygem-charlock_holmes>=0.7.9<0.8:textproc/rubygem-charlock_holmes \
 	rubygem-ruby-magic>=0.6<1:devel/rubygem-ruby-magic \
@@ -224,8 +225,8 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-peek-rails-gitlab>=1.1<2.0:devel/rubygem-peek-rails-gitlab \
 	rubygem-snowplow-tracker>=0.8.0<1:devel/rubygem-snowplow-tracker \
 	rubygem-webrick>=1.9.0<1.10:www/rubygem-webrick \
-	rubygem-prometheus-client-mmap>=1.2.9<1.3:devel/rubygem-prometheus-client-mmap \
-	rubygem-async-gitlab>=2.23.1<2.24:devel/rubygem-async-gitlab \
+	rubygem-prometheus-client-mmap>=1.2.10<1.3:devel/rubygem-prometheus-client-mmap \
+	rubygem-async-gitlab>=2.24.0<2.25:devel/rubygem-async-gitlab \
 	rubygem-gitlab-security_report_schemas>=0.1.2.min15.0.0.max15.2.1<0.1.2.min15.0.0.max15.2.2:devel/rubygem-gitlab-security_report_schemas \
 	rubygem-opentelemetry-sdk>=1.5.0:devel/rubygem-opentelemetry-sdk \
 	rubygem-opentelemetry-exporter-otlp>=0.29.1:devel/rubygem-opentelemetry-exporter-otlp \
@@ -252,7 +253,7 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-opentelemetry-instrumentation-sidekiq>=0.25.7:devel/rubygem-opentelemetry-instrumentation-sidekiq \
 	rubygem-warning>=1.5.0<1.6:devel/rubygem-warning \
 	rubygem-git>=1.19.1<2:devel/rubygem-git \
-	rubygem-gitlab-dangerfiles>=4.9.0<4.10:devel/rubygem-gitlab-dangerfiles \
+	rubygem-gitlab-dangerfiles>=4.9.2<4.10:devel/rubygem-gitlab-dangerfiles \
 	rubygem-license_finder-gitlab>=7.2.1<8:devel/rubygem-license_finder-gitlab \
 	rubygem-rspec>=3.0<4:devel/rubygem-rspec \
 	rubygem-octokit-gitlab>=9.0<10:net/rubygem-octokit-gitlab \
@@ -264,17 +265,17 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-rbtrace>=0.4.14<1.0:devel/rubygem-rbtrace \
 	rubygem-memory_profiler>=1.0<2.0:devel/rubygem-memory_profiler \
 	rubygem-activerecord-explain-analyze>=0.1<1.0:databases/rubygem-activerecord-explain-analyze \
-	rubygem-oauth2-gitlab>=2.0<3:net/rubygem-oauth2-gitlab \
+	rubygem-oauth2-gitlab>=2.0.10<3:net/rubygem-oauth2-gitlab \
 	rubygem-health_check-rails-gitlab>=3.0<4:devel/rubygem-health_check-rails-gitlab \
 	rubygem-vmstat>=2.3.1<2.4.0:sysutils/rubygem-vmstat \
 	rubygem-sys-filesystem14>=1.4.3<1.5:sysutils/rubygem-sys-filesystem14 \
 	rubygem-net-ntp>0:net/rubygem-net-ntp \
 	rubygem-ssh_data>=1.3<2:security/rubygem-ssh_data \
 	rubygem-spamcheck>=1.3.3<1.4:net/rubygem-spamcheck \
-	rubygem-gitaly>=17.8.4:net/rubygem-gitaly \
+	rubygem-gitaly>=18.1.0:net/rubygem-gitaly \
 	rubygem-gitlab-kas-grpc>=${GITLAB_KAS_GRPC_VERSION}:net/rubygem-gitlab-kas-grpc \
-	rubygem-grpc-gitlab>=1.63.0<2:net/rubygem-grpc-gitlab \
-	rubygem-google-protobuf3>=3.25.6<4:devel/rubygem-google-protobuf3 \
+	rubygem-grpc-gitlab>=1.72.0<2:net/rubygem-grpc-gitlab \
+	rubygem-google-protobuf3>=3.25.8<4:devel/rubygem-google-protobuf3 \
 	rubygem-toml-rb>=2.2.0<3:www/rubygem-toml-rb \
 	rubygem-flipper-gitlab>=0.28.0<0.29:devel/rubygem-flipper-gitlab \
 	rubygem-flipper-active_record-rails-gitlab>=0.28.0<0.29:databases/rubygem-flipper-active_record-rails-gitlab \
@@ -282,7 +283,7 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-unleash>=3.2.2<3.3:devel/rubygem-unleash \
 	rubygem-gitlab-experiment>=0.9.1<0.10:devel/rubygem-gitlab-experiment \
 	rubygem-lograge-rails-gitlab>=0.11.2<1.0:www/rubygem-lograge-rails-gitlab \
-	rubygem-grape_logging>=1.8.4<2.0:devel/rubygem-grape_logging \
+	rubygem-grape_logging-gitlab>=1.8.4<2.0:devel/rubygem-grape_logging-gitlab \
 	rubygem-gitlab-net-dns>=0.12.0<0.13:dns/rubygem-gitlab-net-dns \
 	rubygem-countries>=4.1.3<4.2.0:devel/rubygem-countries \
 	rubygem-retriable>=3.1.2<3.2.0:devel/rubygem-retriable \
@@ -293,7 +294,7 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-jsonb_accessor>=1.4<2:www/rubygem-jsonb_accessor \
 	rubygem-json-gitlab>=2.11.2<2.12:devel/rubygem-json-gitlab \
 	rubygem-json_schemer>=2.3.0<2.4:devel/rubygem-json_schemer \
-	rubygem-oj>=3.16.0<3.17:devel/rubygem-oj \
+	rubygem-oj>=3.16.11<3.17:devel/rubygem-oj \
 	rubygem-oj-introspect>=0.8<1:devel/rubygem-oj-introspect \
 	rubygem-multi_json114>=1.14.1<1.15:devel/rubygem-multi_json114 \
 	rubygem-yajl-ruby>=1.4.3<1.5:devel/rubygem-yajl-ruby \
@@ -315,9 +316,9 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-gitlab-sdk>=0.3.0<0.4:devel/rubygem-gitlab-sdk \
 	rubygem-paper_trail>=16.0<17:devel/rubygem-paper_trail \
 	rubygem-i18n_data>=0.13.1<1:devel/rubygem-i18n_data \
-	rubygem-gitlab-cloud-connector>=1.11<2:security/rubygem-gitlab-cloud-connector \
+	rubygem-gitlab-cloud-connector>=1.17<2:security/rubygem-gitlab-cloud-connector \
 	rubygem-google-cloud-profiler-v2>=0.3<1:textproc/rubygem-google-cloud-profiler-v2 \
-	rubygem-parallel>=1.26.3<2:sysutils/rubygem-parallel \
+	rubygem-parallel>=1.27.0<2:sysutils/rubygem-parallel \
 	rubygem-google-cloud-storage_transfer-gitlab>=1.2.0<1.3:net/rubygem-google-cloud-storage_transfer-gitlab \
 	rubygem-minitest>=5.11<6:devel/rubygem-minitest \
 	rubygem-grpc-tools>=1.69.0<1.70:net/rubygem-grpc-tools \
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index d5a735d53bb3..0a2db91e5613 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,4 +1,4 @@
-GITLAB_VERSION=		18.0.2
+GITLAB_VERSION=		18.1.0
 GITLAB_PORTREVISION=	0
 
 # Git version gitaly should use (from gitlab mirror)
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index 6486ad991e06..c22284f466a6 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1749701528
-SHA256 (gitlab-foss-v18.0.2.tar.bz2) = f1f1913ddc308cc26ecc1d8942d81a99cecca220da565c7e915307af790c17e3
-SIZE (gitlab-foss-v18.0.2.tar.bz2) = 116957164
-TIMESTAMP = 1749701568
-SHA256 (gitlab-v18.0.2-ee.tar.bz2) = 7b1cd7fd4241d7ff2f50cddac43aba58f9507a1c5e4db4e6786b4e32efae1b1e
-SIZE (gitlab-v18.0.2-ee.tar.bz2) = 131793925
+TIMESTAMP = 1750221061
+SHA256 (gitlab-foss-v18.1.0.tar.bz2) = 5c909d712494ff50ab1a15abef760388fea062fbb9204e54d0fcf5a28402dbb6
+SIZE (gitlab-foss-v18.1.0.tar.bz2) = 119446403
+TIMESTAMP = 1750221102
+SHA256 (gitlab-v18.1.0-ee.tar.bz2) = 7523f6c04af6a12b682caeca401b7eea80b63e8ec84fdd4e94a886563f81ffe3
+SIZE (gitlab-v18.1.0-ee.tar.bz2) = 134734522
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index fff952d72391..704da6697d22 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,6 +1,6 @@
---- Gemfile.orig	2025-05-14 17:45:50 UTC
+--- Gemfile.orig	2025-06-18 04:18:20 UTC
 +++ Gemfile
-@@ -160,8 +160,8 @@ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', fea
+@@ -164,8 +164,8 @@ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', fea
  gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared
  
  # GraphQL API
@@ -11,7 +11,7 @@
  gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api
  
  # Cells
-@@ -216,7 +216,7 @@ gem 'google-cloud-storage', '~> 1.45.0', feature_categ
+@@ -220,7 +220,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
@@ -20,7 +20,7 @@
  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
+@@ -231,7 +231,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
  
@@ -29,16 +29,7 @@
  gem 'google-cloud-artifact_registry-v1', '~> 0.11.0', feature_category: :shared
  gem 'google-cloud-compute-v1', '~> 2.6.0', feature_category: :shared
  
-@@ -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', require: false, feature_category: :shared
-   gem 'sd_notify', '~> 0.1.0', require: false, feature_category: :shared
- end
- 
-@@ -291,7 +291,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature
+@@ -295,7 +295,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature
  gem 'state_machines-activerecord', '~> 0.8.0', feature_category: :shared
  
  # Background jobs
@@ -47,7 +38,7 @@
  gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability
  gem 'gitlab-sidekiq-fetcher',
    path: 'vendor/gems/sidekiq-reliable-fetch',
-@@ -471,143 +471,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared
+@@ -472,143 +472,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared
  
  gem 'warning', '~> 1.5.0', feature_category: :shared
  
@@ -84,7 +75,7 @@
 -
 -group :development, :test do
 -  gem 'deprecation_toolkit', '~> 2.2.3', require: false, feature_category: :shared
--  gem 'bullet', '~> 7.2.0', feature_category: :shared
+-  gem 'bullet', '~> 8.0.0', feature_category: :shared
 -  gem 'parser', '= 3.3.8.0', feature_category: :shared
 -  gem 'pry-byebug', feature_category: :shared
 -  gem 'pry-rails', '~> 0.3.9', feature_category: :shared
@@ -93,7 +84,7 @@
 -  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 'rspec-rails', '~> 7.1.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)
@@ -113,7 +104,7 @@
 -  gem 'influxdb-client', '~> 3.1', require: false, feature_category: :tooling
 -
 -  gem 'knapsack', '~> 4.0.0', feature_category: :tooling
--  gem 'gitlab-crystalball', '~> 0.7.2', require: false, feature_category: :tooling
+-  gem 'gitlab-crystalball', '~> 1.1.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, feature_category: :shared
@@ -191,27 +182,16 @@
  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
-@@ -642,16 +514,16 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside
- gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat
- 
- # Gitaly GRPC protocol definitions
--gem 'gitaly', '~> 17.8.0', feature_category: :gitaly
-+gem 'gitaly', '~> 17.8', feature_category: :gitaly
+@@ -646,7 +518,7 @@ gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :
+ gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :gitaly
  
  # KAS GRPC protocol definitions
 -gem 'gitlab-kas-grpc', '~> 17.11.0', feature_category: :deployment_management
-+gem 'gitlab-kas-grpc', '~> 18.0', feature_category: :deployment_management
- 
- # Lock the version before issues below are resolved:
- # https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939
- # Or we can upgrade to a more recent version as long as we can confirm
- # that it doesn't have the same issues.
--gem 'grpc', '= 1.63.0', feature_category: :shared
-+gem 'grpc', '~> 1.63', feature_category: :shared
++gem 'gitlab-kas-grpc', '~> 18.1.0', feature_category: :deployment_management
  
- gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared
+ gem 'grpc', '~> 1.72.0', feature_category: :shared
  
-@@ -672,7 +544,7 @@ gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :
+@@ -669,7 +541,7 @@ gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :
  gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :shared
  
  # Countries list
@@ -220,7 +200,7 @@
  
  gem 'retriable', '~> 3.1.2', feature_category: :shared
  
-@@ -753,10 +625,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
+@@ -750,10 +622,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
  
  gem 'duo_api', '~> 1.3', feature_category: :system_access
  
@@ -236,4 +216,4 @@
 -gem "i18n_data", "~> 0.13.1", feature_category: :system_access
 +gem "i18n_data", "~> 0.13", feature_category: :system_access
  
- gem "gitlab-cloud-connector", "~> 1.11", require: 'gitlab/cloud_connector', feature_category: :cloud_connector
+ gem "gitlab-cloud-connector", "~> 1.14", require: 'gitlab/cloud_connector', feature_category: :cloud_connector
diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example
index 3ace91d53c65..334de9d0c6fb 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	2025-05-14 17:45:50 UTC
+--- config/gitlab.yml.example.orig	2025-06-18 04:18:20 UTC
 +++ config/gitlab.yml.example
-@@ -489,7 +489,7 @@ production: &base
+@@ -493,7 +493,7 @@ production: &base
    ## GitLab Pages
    pages:
      enabled: false
@@ -9,20 +9,7 @@
      # The location where pages are stored (default: shared/pages).
      # path: shared/pages
  
-@@ -499,9 +499,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
--    artifacts_server: true # Set to false if you want to disable online view of HTML artifacts
--    # external_http: ["1.1.1.1:80", "[2001::1]:80"] # If defined, enables custom domain support in GitLab Pages
--    # external_https: ["1.1.1.1:443", "[2001::1]:443"] # If defined, enables custom domain and certificate support in GitLab Pages
-+    artifacts_server: false # Set to false if you want to disable online view of HTML artifacts
-+    external_http: ["127.0.0.1:8090"] # If defined, enables custom domain support in GitLab Pages
-+    # external_https: ["127.0.0.1:8090"] # If defined, enables custom domain and certificate support in GitLab Pages
- 
-     # 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).
-@@ -1233,13 +1233,13 @@ production: &base
+@@ -1238,13 +1238,13 @@ production: &base
    repositories:
      storages: # You must have at least a `default` storage path.
        default:
@@ -38,7 +25,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
-@@ -1274,12 +1274,12 @@ production: &base
+@@ -1279,12 +1279,12 @@ production: &base
  
    ## GitLab Shell settings
    gitlab_shell:
@@ -54,7 +41,7 @@
  
      # Git over HTTP
      upload_pack: true
-@@ -1294,7 +1294,7 @@ production: &base
+@@ -1299,7 +1299,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 +50,7 @@
  
    cell:
      # enabled: false
-@@ -1312,7 +1312,7 @@ production: &base
+@@ -1317,7 +1317,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 +59,7 @@
  
      # The URL to the external KAS API (used by the Kubernetes agents)
      # external_url: wss://kas.example.com
-@@ -1339,13 +1339,13 @@ production: &base
+@@ -1344,13 +1344,13 @@ production: &base
  
    ## GitLab Elasticsearch settings
    elasticsearch:
@@ -88,7 +75,7 @@
  
    ## Webpack settings
    # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
-@@ -1366,18 +1366,18 @@ production: &base
+@@ -1371,18 +1371,18 @@ production: &base
  
      # Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq.
      sidekiq_exporter:
@@ -114,7 +101,7 @@
  
      # Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma.
      web_exporter:
-@@ -1604,13 +1604,13 @@ test:
+@@ -1609,13 +1609,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 9844d39df8d4..cf08a9593f99 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,4 +1,4 @@
---- gems/gitlab-backup-cli/gitlab-backup-cli.gemspec.orig	2025-05-14 17:45:50 UTC
+--- gems/gitlab-backup-cli/gitlab-backup-cli.gemspec.orig	2025-06-18 04:18:20 UTC
 +++ gems/gitlab-backup-cli/gitlab-backup-cli.gemspec
 @@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
    spec.add_dependency "activerecord", ">= 7"
@@ -9,12 +9,7 @@
    spec.add_dependency "google-cloud-storage_transfer", "~> 1.2.0"
    spec.add_dependency "mutex_m", "~> 0.3"
    spec.add_dependency "pg", "~> 1.5.6"
-@@ -40,11 +40,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"
--  spec.add_dependency "grpc", "= 1.63.0"
-+  spec.add_dependency "grpc", "~> 1.63"
+@@ -44,7 +44,7 @@ Gem::Specification.new do |spec|
    spec.add_dependency "json", "~> 2.7"
    spec.add_dependency "jwt", "~> 2.5"
    spec.add_dependency "logger", "~> 1.5"
diff --git a/www/gitlab/pkg-message b/www/gitlab/pkg-message
index 59992ca06610..d736f45ba52d 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/18.0-freebsd.md
+https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/install/18.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 17.9.x to 17.10.x, please follow the instructions in the guide at:
 
-https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/17.11-18.0-freebsd.md
+https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/18.0-18.1-freebsd.md
 
 If you just installed an minor upgrade of GitLab please follow
 the instructions in the guide at: