www/gitlab: major upgrade to 18.2.0

Made portclippy happy.

Changes:	https://about.gitlab.com/releases/2025/07/17/gitlab-18-2-released/

22 files changed, 161 insertions, 108 deletions

diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 64bb1010af84..50b44de5e20d 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -25,9 +25,9 @@ CPE_VENDOR=	gitlab
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
+GL_TUPLE=	gitlab-org:git:v${GITLAB_GIT_VERSION}:_build/_build/deps/git-v${GITLAB_GIT_VERSION_SHORT}
 GO_MOD_DIST=	gitlab
 GO_MODULE=	gitlab.com/gitlab-org/gitaly/v18
-GL_TUPLE=	gitlab-org:git:v${GITLAB_GIT_VERSION}:_build/_build/deps/git-v${GITLAB_GIT_VERSION_SHORT}
 
 MAKE_ENV=	GOFLAGS="${GO_BUILDFLAGS}"
 # make sure to pass go build options into make process
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index ccf599dc21c3..326621df2ba3 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1752120719
-SHA256 (go/devel_gitaly/gitaly-v18.1.2/go.mod) = c0924eaae5b6c66c0e8d04e25e1dad85b88be0d33008524c3e6a9eca51311dcb
-SIZE (go/devel_gitaly/gitaly-v18.1.2/go.mod) = 13011
-SHA256 (go/devel_gitaly/gitaly-v18.1.2/gitaly-v18.1.2.tar.bz2) = 8538f12c47dcb7ad3cd9c1bafe003d8e3f6fc2e26b10031f835af624d8c12c55
-SIZE (go/devel_gitaly/gitaly-v18.1.2/gitaly-v18.1.2.tar.bz2) = 4541124
-SHA256 (go/devel_gitaly/gitaly-v18.1.2/git-v2.49.0.tar.bz2) = 63678e3839f5af667b48cb9d0c37de4b249916dc19aae7c5ce83d07fb3146ecb
-SIZE (go/devel_gitaly/gitaly-v18.1.2/git-v2.49.0.tar.bz2) = 9079092
+TIMESTAMP = 1752679148
+SHA256 (go/devel_gitaly/gitaly-v18.2.0/go.mod) = ec7c02d0d63b1125e6446a6c2ada6fc2efa12d332da58b7c9c9cd56103cc51ed
+SIZE (go/devel_gitaly/gitaly-v18.2.0/go.mod) = 13011
+SHA256 (go/devel_gitaly/gitaly-v18.2.0/gitaly-v18.2.0.tar.bz2) = 8d1543f363464030eb72c83d6d32f6020e7c912de95fb3a33659995d20598d0f
+SIZE (go/devel_gitaly/gitaly-v18.2.0/gitaly-v18.2.0.tar.bz2) = 4543392
+SHA256 (go/devel_gitaly/gitaly-v18.2.0/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4
+SIZE (go/devel_gitaly/gitaly-v18.2.0/git-v2.50.0.tar.bz2) = 9249878
diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile
index 9345aecfdf54..871068592d17 100644
--- a/devel/gitaly/files/patch-Makefile
+++ b/devel/gitaly/files/patch-Makefile
@@ -1,6 +1,69 @@
---- Makefile.orig	2025-05-14 17:37:06 UTC
+--- Makefile.orig	2025-07-16 11:35:37 UTC
 +++ Makefile
-@@ -717,12 +717,12 @@ ${DEPENDENCY_DIR}/git-%/Makefile: ${DEPENDENCY_DIR}/gi
+@@ -156,7 +156,6 @@ GIT_VERSION ?=
+ # GIT_VERSION_x_xx defines versions for each instance of bundled Git we ship. When a new
+ # major version is added, be sure to update GIT_PACKED_EXECUTABLES, the *-bundled-git targets,
+ # and add new targets under the "# These targets build specific releases of Git." section.
+-GIT_VERSION_2_49 ?= v2.49.0.gl2
+ GIT_VERSION_2_50 ?= v2.50.1.gl1
+ #
+ # OVERRIDE_GIT_VERSION allows you to specify a custom semver value to be reported by the
+@@ -168,7 +167,7 @@ ifeq (${GIT_VERSION:default=},)
+ ifeq (${GIT_VERSION:default=},)
+ 	# GIT_VERSION should be overridden to the default version of bundled Git. This is only
+ 	# necessary until https://gitlab.com/gitlab-org/gitaly/-/issues/6195 is complete.
+-    override GIT_VERSION := ${GIT_VERSION_2_49}
++    override GIT_VERSION := ${GIT_VERSION_2_50}
+     # When GIT_VERSION is not explicitly set, we default to bundled Git.
+ 	export WITH_BUNDLED_GIT = YesPlease
+ else
+@@ -264,8 +263,7 @@ BUILD_GEM_NAME ?= gitaly
+ BUILD_GEM_NAME ?= gitaly
+ 
+ # Git binaries that are eventually embedded into the Gitaly binary.
+-GIT_PACKED_EXECUTABLES       = $(addprefix ${BUILD_DIR}/bin/gitaly-, $(addsuffix -v2.49, ${GIT_EXECUTABLES})) \
+-                               $(addprefix ${BUILD_DIR}/bin/gitaly-, $(addsuffix -v2.50, ${GIT_EXECUTABLES}))
++GIT_PACKED_EXECUTABLES       = $(addprefix ${BUILD_DIR}/bin/gitaly-, $(addsuffix -v2.50, ${GIT_EXECUTABLES}))
+ 
+ # All executables provided by Gitaly.
+ GITALY_EXECUTABLES           = $(addprefix ${BUILD_DIR}/bin/,$(notdir $(shell find ${SOURCE_DIR}/cmd -mindepth 1 -maxdepth 1 -type d -print)))
+@@ -354,15 +352,13 @@ install: build
+ 
+ .PHONY: build-bundled-git
+ ## Build bundled Git binaries.
+-build-bundled-git: build-bundled-git-v2.49 build-bundled-git-v2.50
+-build-bundled-git-v2.49: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.49,${GIT_EXECUTABLES})
++build-bundled-git: build-bundled-git-v2.50
+ build-bundled-git-v2.50: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.50,${GIT_EXECUTABLES})
+ 
+ .PHONY: install-bundled-git
+ ## Install bundled Git binaries. The target directory can be modified by
+ ## setting PREFIX and DESTDIR.
+-install-bundled-git: install-bundled-git-v2.49 install-bundled-git-v2.50
+-install-bundled-git-v2.49: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.49,${GIT_EXECUTABLES})
++install-bundled-git: install-bundled-git-v2.50
+ install-bundled-git-v2.50: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.50,${GIT_EXECUTABLES})
+ 
+ ifdef WITH_BUNDLED_GIT
+@@ -684,17 +680,12 @@ ${DEPENDENCY_DIR}/git-distribution/build/git: ${DEPEND
+ 	${Q}touch $@
+ 
+ # These targets build specific releases of Git.
+-${BUILD_DIR}/bin/gitaly-%-v2.49: override GIT_VERSION = ${GIT_VERSION_2_49}
+ ${BUILD_DIR}/bin/gitaly-%-v2.50: override GIT_VERSION = ${GIT_VERSION_2_50}
+ 
+ ifdef USE_MESON
+-${BUILD_DIR}/bin/gitaly-%-v2.49: ${DEPENDENCY_DIR}/git-v2.49/build/% | ${BUILD_DIR}/bin
+-	${Q}install $< $@
+ ${BUILD_DIR}/bin/gitaly-%-v2.50: ${DEPENDENCY_DIR}/git-v2.50/build/% | ${BUILD_DIR}/bin
+ 	${Q}install $< $@
+ else
+-${BUILD_DIR}/bin/gitaly-%-v2.49: ${DEPENDENCY_DIR}/git-v2.49/% | ${BUILD_DIR}/bin
+-	${Q}install $< $@
+ ${BUILD_DIR}/bin/gitaly-%-v2.50: ${DEPENDENCY_DIR}/git-v2.50/% | ${BUILD_DIR}/bin
+ 	${Q}install $< $@
+ endif
+@@ -731,12 +722,12 @@ ${DEPENDENCY_DIR}/git-%/Makefile: ${DEPENDENCY_DIR}/gi
  # otherwise try to rebuild all targets depending on it whenever we build
  # something else. We thus depend on the Makefile instead.
  ${DEPENDENCY_DIR}/git-%/Makefile: ${DEPENDENCY_DIR}/git-%.version
diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile
index 4cc0e2c9205f..9e98e6868819 100644
--- a/devel/gitlab-shell/Makefile
+++ b/devel/gitlab-shell/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitlab-shell
-PORTVERSION=	14.42.0
+PORTVERSION=	14.43.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
@@ -13,7 +13,7 @@ LICENSE=	MIT
 # https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/720
 #BUILD_DEPENDS=	heimdal>=0:security/heimdal
 
-USES=		gmake go:modules,no_targets,1.23 pkgconfig
+USES=		gmake go:modules,no_targets,1.24 pkgconfig
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
diff --git a/devel/gitlab-shell/distinfo b/devel/gitlab-shell/distinfo
index c0fb1a1a36c4..c3fc85caa41c 100644
--- a/devel/gitlab-shell/distinfo
+++ b/devel/gitlab-shell/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1747896733
-SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.42.0/go.mod) = 03a99472d6dba82d6abef4c58ec01a339c8001966d7feebc3a41db804d736c1e
-SIZE (go/devel_gitlab-shell/gitlab-shell-v14.42.0/go.mod) = 6034
-SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.42.0/gitlab-shell-v14.42.0.tar.bz2) = a5b932818f580d4876dbf6e9fd4a4955a0b9ba22c620cbb2ee79cee741601086
-SIZE (go/devel_gitlab-shell/gitlab-shell-v14.42.0/gitlab-shell-v14.42.0.tar.bz2) = 173780
+TIMESTAMP = 1752677513
+SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.43.0/go.mod) = 0ce82c489c0d218be51dd0fc2ee44bca651c0d79e3a99b6aef3918a78bfbad8d
+SIZE (go/devel_gitlab-shell/gitlab-shell-v14.43.0/go.mod) = 6034
+SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.43.0/gitlab-shell-v14.43.0.tar.bz2) = 05b56edd8b60f24217c72526a3ab0f0933841077be3a8f96bb77c2c2320c4a63
+SIZE (go/devel_gitlab-shell/gitlab-shell-v14.43.0/gitlab-shell-v14.43.0.tar.bz2) = 174499
diff --git a/net/gitlab-agent/Makefile b/net/gitlab-agent/Makefile
index 8aae2990842e..9013daf97fef 100644
--- a/net/gitlab-agent/Makefile
+++ b/net/gitlab-agent/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gitlab-agent
 PORTVERSION=	${GITLAB_VERSION}
-PORTREVISION=	${GITLAB_PORTREVISION} # modify it in www/gitlab/Makefile.common
 DISTVERSIONPREFIX=	v
+PORTREVISION=	${GITLAB_PORTREVISION} # modify it in www/gitlab/Makefile.common
 CATEGORIES=	net
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -14,7 +14,7 @@ LICENSE=	MIT
 BUILD_DEPENDS=	git>=0:devel/git \
 		golangci-lint>=0:devel/golangci-lint
 
-USES=		go:modules,1.23
+USES=		go:modules,1.24
 GO_MODULE=	gitlab.com/gitlab-org/cluster-integration/gitlab-agent/v18
 
 _BUILD_DATE=	$$(date -u "+%Y-%m-%d-%H%M UTC")
diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo
index 8edb80da5733..9edabb89baeb 100644
--- a/net/gitlab-agent/distinfo
+++ b/net/gitlab-agent/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1752120725
-SHA256 (go/net_gitlab-agent/gitlab-agent-v18.1.2/v18.1.2.mod) = 2739a9f4b5204729b51ad90bd66634bab4c4a4f2db5a8f3ec80c7eda733484db
-SIZE (go/net_gitlab-agent/gitlab-agent-v18.1.2/v18.1.2.mod) = 9688
-SHA256 (go/net_gitlab-agent/gitlab-agent-v18.1.2/v18.1.2.zip) = a96cd3e050611991f370b95c284ecb3e8b8d5f0a460988abde5b7ef8c25b8c51
-SIZE (go/net_gitlab-agent/gitlab-agent-v18.1.2/v18.1.2.zip) = 1672549
+TIMESTAMP = 1752677035
+SHA256 (go/net_gitlab-agent/gitlab-agent-v18.2.0/v18.2.0.mod) = 4772214d0f7667ed5a2f465d728888c258c09e89afb5e4b0e6e5a087b77057fd
+SIZE (go/net_gitlab-agent/gitlab-agent-v18.2.0/v18.2.0.mod) = 9809
+SHA256 (go/net_gitlab-agent/gitlab-agent-v18.2.0/v18.2.0.zip) = 23e76612b7c0694ef093e71826bb94386f7f18531f9ffb4122a4e823bb48af94
+SIZE (go/net_gitlab-agent/gitlab-agent-v18.2.0/v18.2.0.zip) = 1707851
diff --git a/net/rubygem-gitlab-kas-grpc/distinfo b/net/rubygem-gitlab-kas-grpc/distinfo
index 68d91d8cd5df..e3643c1df22c 100644
--- a/net/rubygem-gitlab-kas-grpc/distinfo
+++ b/net/rubygem-gitlab-kas-grpc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1752120745
-SHA256 (rubygem/gitlab-kas-grpc-18.1.2.gem) = 4624830b22b0918570b73fd99a5a9464518b4715d0ef51a6343dc8d1b030bcd1
-SIZE (rubygem/gitlab-kas-grpc-18.1.2.gem) = 10752
+TIMESTAMP = 1752677055
+SHA256 (rubygem/gitlab-kas-grpc-18.2.0.gem) = c14314fdcac6ef12794f6293979d0e2fcbcb01bb55fb04ee37e10d4337a99b6e
+SIZE (rubygem/gitlab-kas-grpc-18.2.0.gem) = 10752
diff --git a/textproc/gitlab-elasticsearch-indexer/Makefile b/textproc/gitlab-elasticsearch-indexer/Makefile
index bee6b6d7f027..2c4be3c0ea02 100644
--- a/textproc/gitlab-elasticsearch-indexer/Makefile
+++ b/textproc/gitlab-elasticsearch-indexer/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gitlab-elasticsearch-indexer
-PORTVERSION=	5.5.1
+PORTVERSION=	5.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,1.23 pkgconfig
+USES=		gmake go:modules,no_targets,1.24 pkgconfig
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
diff --git a/textproc/gitlab-elasticsearch-indexer/distinfo b/textproc/gitlab-elasticsearch-indexer/distinfo
index bc2d4d260d5c..8225879fbd20 100644
--- a/textproc/gitlab-elasticsearch-indexer/distinfo
+++ b/textproc/gitlab-elasticsearch-indexer/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1747460912
-SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.5.1/go.mod) = 8068957d1b33fc14f4bf77e4807fd89c7b3f57ccc88a093269c94bfc38479d5c
-SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.5.1/go.mod) = 5509
-SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.5.1/gitlab-elasticsearch-indexer-v5.5.1.tar.bz2) = 8757d4e7f2bffe36a5538a7ca3769e958aeb3e76c6a360281c8c0f603ae695e5
-SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.5.1/gitlab-elasticsearch-indexer-v5.5.1.tar.bz2) = 90188
+TIMESTAMP = 1752677228
+SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.7.0/go.mod) = 6d07860d1af5a063ad7b2606b1a339b957cec48dc85f04a62b337c2d63ac4daf
+SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.7.0/go.mod) = 5605
+SHA256 (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.7.0/gitlab-elasticsearch-indexer-v5.7.0.tar.bz2) = 4383624e2d3aeb8a36f2cfcbfef13c4e014cbbacc56393065c026c8a1d8e224d
+SIZE (go/textproc_gitlab-elasticsearch-indexer/gitlab-elasticsearch-indexer-v5.7.0/gitlab-elasticsearch-indexer-v5.7.0.tar.bz2) = 116772
diff --git a/www/gitlab-pages/Makefile b/www/gitlab-pages/Makefile
index ea3b234abcff..52de50f3e3f1 100644
--- a/www/gitlab-pages/Makefile
+++ b/www/gitlab-pages/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gitlab-pages
 PORTVERSION=	${GITLAB_VERSION}
-PORTREVISION=	${GITLAB_PORTREVISION} # modify it in www/gitlab/Makefile.common
 DISTVERSIONPREFIX=	v
+PORTREVISION=	${GITLAB_PORTREVISION} # modify it in www/gitlab/Makefile.common
 CATEGORIES=	www
 MASTER_SITES+=	https://gitlab.com/gitlab-org/gitlab-pages/-/raw/v${DISTVERSION}/
 DISTFILES+=	go.mod
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
index 1de09c0be7d8..ea3024c9d6d7 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1752120731
-SHA256 (go/www_gitlab-pages/gitlab-pages-v18.1.2/go.mod) = a5b3bb24fd3351af28849dfc2bb09acd9d7f4d06e3f065776685482d0745e180
-SIZE (go/www_gitlab-pages/gitlab-pages-v18.1.2/go.mod) = 3435
-SHA256 (go/www_gitlab-pages/gitlab-pages-v18.1.2/gitlab-pages-v18.1.2.tar.bz2) = a069447d9af1c393331dd6a2f6a04dac0cd0ac7dfeb9ec1d37d461a4768c9607
-SIZE (go/www_gitlab-pages/gitlab-pages-v18.1.2/gitlab-pages-v18.1.2.tar.bz2) = 235679
+TIMESTAMP = 1752677038
+SHA256 (go/www_gitlab-pages/gitlab-pages-v18.2.0/go.mod) = fabce2d66cf34e44e541a57220574dbef2778f98afa0e86272882385608871f1
+SIZE (go/www_gitlab-pages/gitlab-pages-v18.2.0/go.mod) = 3435
+SHA256 (go/www_gitlab-pages/gitlab-pages-v18.2.0/gitlab-pages-v18.2.0.tar.bz2) = 39ac8c911693ce0549c8da818577ae78b193ed6f1d27b48abddc92c446989ed7
+SIZE (go/www_gitlab-pages/gitlab-pages-v18.2.0/gitlab-pages-v18.2.0.tar.bz2) = 236137
diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile
index f4a28d010783..1af8d810ab4f 100644
--- a/www/gitlab-workhorse/Makefile
+++ b/www/gitlab-workhorse/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	gitlab-workhorse
 PORTVERSION=	${GITLAB_VERSION}
-PORTREVISION=	${GITLAB_PORTREVISION} # modify it in www/gitlab/Makefile.common
 DISTVERSIONPREFIX=	v
+PORTREVISION=	${GITLAB_PORTREVISION} # modify it in www/gitlab/Makefile.common
 CATEGORIES=	www
 
 MAINTAINER=	mfechner@FreeBSD.org
@@ -19,11 +19,11 @@ USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 GL_PROJECT=	gitlab-foss
 GO_MOD_DIST=	gitlab
+GO_MODULE=	gitlab.com/gitlab-org/gitlab/workhorse
 MAKE_ENV=	GOFLAGS="${GO_BUILDFLAGS}"
 MAKE_ENV+=	${GO_ENV}
 WRKSRC_SUBDIR=	workhorse
 # found in work/gitlab-foss*/workhorse/go.mod
-GO_MODULE=	gitlab.com/gitlab-org/gitlab/workhorse
 
 PLIST_FILES=	bin/gitlab-resize-image \
 		bin/gitlab-workhorse \
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index 8ef8a977be19..04b929e44a9d 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1752120745
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.1.2/go.mod) = ba6f1d47b9d8b718a588b1de93d521341655934b0d8038a32777a34d97168804
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.1.2/go.mod) = 9144
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.1.2/gitlab-foss-v18.1.2.tar.bz2) = 4ddd03411d0e58ebaedce10aac0992c941f2170e9c8109ffd05e5f91cde834a0
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.1.2/gitlab-foss-v18.1.2.tar.bz2) = 119451022
+TIMESTAMP = 1752677054
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.2.0/go.mod) = 188c374b005aba0ee613477584379e4f1f3344b4f68d33274c9aac043c95f448
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.2.0/go.mod) = 9293
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.2.0/gitlab-foss-v18.2.0.tar.bz2) = 23a1309fb73f19ccfc3100611e1149a3405563862d697829e9cf0080c9487565
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.2.0/gitlab-foss-v18.2.0.tar.bz2) = 121280838
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index 8db1cc48aeb4..8bb15d8f52a1 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -29,11 +29,12 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 # mail/rubygem-net-pop is required as ruby 3.1 removed it
 #gitlab-zoekt-indexer>=0.16.0:textproc/gitlab-zoekt-indexer
 MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
-	gitlab-elasticsearch-indexer>=5.5.1:textproc/gitlab-elasticsearch-indexer \
+	gitlab-elasticsearch-indexer>=5.7.0:textproc/gitlab-elasticsearch-indexer \
 	gitlab-agent>=${GITLAB_VERSION}:net/gitlab-agent \
 	gitlab-pages>=${GITLAB_VERSION}:www/gitlab-pages \
-	gitlab-shell>=14.42.0:devel/gitlab-shell \
+	gitlab-shell>=14.43.0:devel/gitlab-shell \
 	gitlab-workhorse>=${GITLAB_VERSION}:www/gitlab-workhorse \
+	gitlab-zoekt-indexer>=0.24.0:textproc/gitlab-zoekt-indexer \
 	redis>=6.2.11:databases/redis \
 	yarn${NODEJS_SUFFIX}>=1.10.0:www/yarn${NODEJS_SUFFIX} \
 	gtar>0:archivers/gtar \
@@ -44,13 +45,13 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-net-pop>=0:mail/rubygem-net-pop \
 	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-drb-gitlab>=2.2.3<3:devel/rubygem-drb-gitlab \
 	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.29.1<1:security/rubygem-gitlab-secret_detection \
+	rubygem-openssl>=3.3.0<4:security/rubygem-openssl \
+	rubygem-gitlab-secret_detection>=0.33.0<1:security/rubygem-gitlab-secret_detection \
 	rubygem-responders-rails-gitlab>=3.0<4.0:www/rubygem-responders-rails-gitlab \
-	rubygem-sprockets-gitlab>=3.7.0<3.8:devel/rubygem-sprockets-gitlab \
+	rubygem-sprockets-gitlab>=3.7.5<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.23.2<3.24:devel/rubygem-view_component-rails-gitlab \
 	rubygem-pg>=1.5.9<1.6:databases/rubygem-pg \
@@ -69,7 +70,7 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-rexml>=3.4.1<3.5:textproc/rubygem-rexml \
 	rubygem-ruby-saml-gitlab>=1.18<2:security/rubygem-ruby-saml-gitlab \
 	rubygem-omniauth-saml-gitlab>=2.2.3<3:security/rubygem-omniauth-saml-gitlab \
-	rubygem-omniauth>=2.1.2<3:security/rubygem-omniauth \
+	rubygem-omniauth>=2.1.3<3:security/rubygem-omniauth \
 	rubygem-omniauth-auth0-gitlab>=3.1.1<3.2.0:net/rubygem-omniauth-auth0-gitlab \
 	rubygem-omniauth-azure-activedirectory-v2>=2.0<3:net/rubygem-omniauth-azure-activedirectory-v2 \
 	rubygem-omniauth-alicloud>=3.0.0<3.1:security/rubygem-omniauth-alicloud \
@@ -91,7 +92,7 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	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-acme-client-gitlab>=2.0.22<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 \
 	rubygem-gpgme>=2.0.24<2.1.0:security/rubygem-gpgme \
@@ -139,7 +140,7 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	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.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-cloudformation-gitlab>=1.133<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 \
@@ -165,7 +166,7 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	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<4:textproc/rubygem-diffy \
-	rubygem-rack22>=2.2.13,3<2.3,3:www/rubygem-rack22 \
+	rubygem-rack22>=2.2.17,3<2.3,3:www/rubygem-rack22 \
 	rubygem-rack-timeout>=0.7.0<0.8:www/rubygem-rack-timeout \
 	rubygem-puma>=6.6.0<6.6.1:www/rubygem-puma \
 	rubygem-sd_notify>=0.1.1<0.2:devel/rubygem-sd_notify \
@@ -188,7 +189,6 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	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 \
 	rubygem-kubeclient>=4.11.0<4.12.0:www/rubygem-kubeclient \
 	rubygem-ruby-openai37>=3.7<4:www/rubygem-ruby-openai37 \
 	rubygem-circuitbox>=2.0.0<2.1:www/rubygem-circuitbox \
@@ -215,7 +215,7 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-sentry-sidekiq>=5.23.0<5.24:devel/rubygem-sentry-sidekiq \
 	rubygem-pg_query>=6.1.0<6.2:databases/rubygem-pg_query \
 	rubygem-premailer-rails-rails-gitlab>=1.12.0<1.13:mail/rubygem-premailer-rails-rails-gitlab \
-	rubygem-gitlab-labkit>=0.37.0<0.38:devel/rubygem-gitlab-labkit \
+	rubygem-gitlab-labkit>=0.39.0<0.40:devel/rubygem-gitlab-labkit \
 	rubygem-thrift>=0.16.0:devel/rubygem-thrift \
 	rubygem-rails-i18n-rails-gitlab>=7.0.9<8:devel/rubygem-rails-i18n-rails-gitlab \
 	rubygem-gettext_i18n_rails>=1.13.0<1.14:devel/rubygem-gettext_i18n_rails \
@@ -227,7 +227,7 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-webrick>=1.9.0<1.10:www/rubygem-webrick \
 	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-gitlab-security_report_schemas>=0.1.3.min15.0.0.max15.2.2<0.1.3.min15.0.0.max15.2.3: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 \
 	rubygem-opentelemetry-instrumentation-active_support>=0.6.0:devel/rubygem-opentelemetry-instrumentation-active_support \
@@ -257,12 +257,12 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	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 \
-	rubygem-faraday-multipart>=1.0<2:www/rubygem-faraday-multipart \
+	rubygem-faraday-multipart>=1.1.1<2:www/rubygem-faraday-multipart \
 	rubygem-gitlab-mail_room>=0.0.27<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 \
 	rubygem-stackprof>=0.2.27<0.3:devel/rubygem-stackprof \
-	rubygem-rbtrace>=0.4.14<1.0:devel/rubygem-rbtrace \
+	rubygem-rbtrace>=0.5.2<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.10<3:net/rubygem-oauth2-gitlab \
@@ -305,6 +305,7 @@ MY_DEPENDS=	gitaly>=${GITLAB_VERSION}:devel/gitaly \
 	rubygem-cvss-suite>=3.3.0<3.4:security/rubygem-cvss-suite \
 	rubygem-arr-pm>=0.0.12<0.1:devel/rubygem-arr-pm \
 	rubygem-devfile>=0.4.4<0.5:net/rubygem-devfile \
+	rubygem-hashdiff>=1.2.0<1.3:devel/rubygem-hashdiff \
 	rubygem-CFPropertyList-gitlab>=3.0.7<3.1:devel/rubygem-CFPropertyList-gitlab \
 	rubygem-app_store_connect>=0:net/rubygem-app_store_connect \
 	rubygem-telesignenterprise>=2.2<3:devel/rubygem-telesignenterprise \
@@ -316,7 +317,7 @@ 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.17<2:security/rubygem-gitlab-cloud-connector \
+	rubygem-gitlab-cloud-connector>=1.21<2:security/rubygem-gitlab-cloud-connector \
 	rubygem-google-cloud-profiler-v2>=0.3<1:textproc/rubygem-google-cloud-profiler-v2 \
 	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 \
@@ -345,7 +346,8 @@ GL_PROJECT=	gitlab-foss
 
 USE_RC_SUBR=	gitlab
 
-SHEBANG_FILES=	scripts/build_assets_image \
+SHEBANG_FILES=	gems/bundler-checksum/test/project_with_checksum_lock/scripts/test \
+		scripts/build_assets_image \
 		scripts/build_qa_image \
 		scripts/build_gdk_image \
 		scripts/compile_assets \
@@ -359,7 +361,6 @@ SHEBANG_FILES=	scripts/build_assets_image \
 		.lefthook/pre-push/merge_conflicts \
 		qa/gdk/entrypoint \
 		qa/bin/test \
-		vendor/gems/bundler-checksum/test/project_with_checksum_lock/scripts/test \
 		vendor/gems/sidekiq/scripts/update-sidekiq.sh
 
 CONFLICTS_INSTALL=	gitolite \
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index ff68c32fb6f9..5b26abcfe873 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,10 +1,10 @@
-GITLAB_VERSION=		18.1.2
+GITLAB_VERSION=		18.2.0
 GITLAB_PORTREVISION=	0
 
 # Git version gitaly should use (from gitlab mirror)
 # Find current tag from Makefile and .gitlab-ci.yaml
 # and from https://gitlab.com/gitlab-org/git/-/tags
-GITLAB_GIT_VERSION=	2.49.0
+GITLAB_GIT_VERSION=	2.50.0
 # return something like x.yy
 GITLAB_GIT_VERSION_SHORT=	${GITLAB_GIT_VERSION:C/^([0-9]*\.[0-9]*)\..*/\1/}
 
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index 33b5475934e2..df7dca2e03fe 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1752120708
-SHA256 (gitlab-foss-v18.1.2.tar.bz2) = 4ddd03411d0e58ebaedce10aac0992c941f2170e9c8109ffd05e5f91cde834a0
-SIZE (gitlab-foss-v18.1.2.tar.bz2) = 119451022
-TIMESTAMP = 1752120712
-SHA256 (gitlab-v18.1.2-ee.tar.bz2) = 491dfc7d35b76f93bce08ec3a144f38bddb2db694832b5738872d17ec5e60a1a
-SIZE (gitlab-v18.1.2-ee.tar.bz2) = 134768496
+TIMESTAMP = 1752677001
+SHA256 (gitlab-foss-v18.2.0.tar.bz2) = 23a1309fb73f19ccfc3100611e1149a3405563862d697829e9cf0080c9487565
+SIZE (gitlab-foss-v18.2.0.tar.bz2) = 121280838
+TIMESTAMP = 1752677001
+SHA256 (gitlab-v18.2.0-ee.tar.bz2) = 867f7292eec847e786a56c7fb15c7d8139993e3e29e2e7dd0bc9f580167470e9
+SIZE (gitlab-v18.2.0-ee.tar.bz2) = 136600640
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index b1f8737fef56..12b4438204ba 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig	2025-07-09 01:48:55 UTC
+--- Gemfile.orig	2025-07-16 11:39:10 UTC
 +++ Gemfile
 @@ -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
@@ -38,7 +38,7 @@
  gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability
  gem 'gitlab-sidekiq-fetcher',
    path: 'vendor/gems/sidekiq-reliable-fetch',
-@@ -472,143 +472,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared
+@@ -465,143 +465,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared
  
  gem 'warning', '~> 1.5.0', feature_category: :shared
  
@@ -85,7 +85,7 @@
 -
 -  gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database
 -  gem 'rspec-rails', '~> 7.1.0', feature_category: :shared
--  gem 'factory_bot_rails', '~> 6.4.3', feature_category: :tooling
+-  gem 'factory_bot_rails', '~> 6.5.0', feature_category: :tooling
 -
 -  # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
 -  gem 'minitest', '~> 5.11.0', feature_category: :shared
@@ -135,7 +135,7 @@
 -  gem 'simplecov', '~> 0.22', require: false, feature_category: :tooling
 -  gem 'simplecov-lcov', '~> 0.8.0', require: false, feature_category: :tooling
 -  gem 'simplecov-cobertura', '~> 2.1.0', require: false, feature_category: :tooling
--  gem 'undercover', '~> 0.6.0', require: false, feature_category: :tooling
+-  gem 'undercover', '~> 0.7.0', require: false, feature_category: :tooling
 -end
 -
  # Gems required in omnibus-gitlab pipeline
@@ -182,12 +182,12 @@
  gem 'octokit', '~> 9.0', feature_category: :importers
  # Needed by octokit: https://github.com/octokit/octokit.rb/pull/1688
  gem 'faraday-multipart', '~> 1.0', feature_category: :importers
-@@ -646,11 +518,11 @@ gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :
+@@ -639,11 +511,11 @@ 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.1.0', feature_category: :deployment_management
+-gem 'gitlab-kas-grpc', '~> 18.1.0', feature_category: :deployment_management
++gem 'gitlab-kas-grpc', '~> 18.2.0', feature_category: :deployment_management
  
  # Lock until 1.74.0 is available
  # https://gitlab.com/gitlab-com/gl-infra/production/-/issues/20067
@@ -196,7 +196,7 @@
  
  gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared
  
-@@ -671,7 +543,7 @@ gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :
+@@ -664,7 +536,7 @@ gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :
  gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :shared
  
  # Countries list
@@ -205,7 +205,7 @@
  
  gem 'retriable', '~> 3.1.2', feature_category: :shared
  
-@@ -752,10 +624,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
+@@ -746,10 +618,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
  
  gem 'duo_api', '~> 1.3', feature_category: :system_access
  
@@ -221,4 +221,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.14", require: 'gitlab/cloud_connector', feature_category: :cloud_connector
+ gem "gitlab-cloud-connector", "~> 1.21", require: 'gitlab/cloud_connector', feature_category: :plan_provisioning
diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example
index 334de9d0c6fb..d06f8232e96f 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-06-18 04:18:20 UTC
+--- config/gitlab.yml.example.orig	2025-07-16 11:39:10 UTC
 +++ config/gitlab.yml.example
-@@ -493,7 +493,7 @@ production: &base
+@@ -498,7 +498,7 @@ production: &base
    ## GitLab Pages
    pages:
      enabled: false
@@ -9,7 +9,7 @@
      # The location where pages are stored (default: shared/pages).
      # path: shared/pages
  
-@@ -1238,13 +1238,13 @@ production: &base
+@@ -1243,13 +1243,13 @@ production: &base
    repositories:
      storages: # You must have at least a `default` storage path.
        default:
@@ -25,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
-@@ -1279,12 +1279,12 @@ production: &base
+@@ -1284,12 +1284,12 @@ production: &base
  
    ## GitLab Shell settings
    gitlab_shell:
@@ -41,7 +41,7 @@
  
      # Git over HTTP
      upload_pack: true
-@@ -1299,7 +1299,7 @@ production: &base
+@@ -1304,7 +1304,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).
@@ -50,7 +50,7 @@
  
    cell:
      # enabled: false
-@@ -1317,7 +1317,7 @@ production: &base
+@@ -1322,7 +1322,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).
@@ -59,7 +59,7 @@
  
      # The URL to the external KAS API (used by the Kubernetes agents)
      # external_url: wss://kas.example.com
-@@ -1344,13 +1344,13 @@ production: &base
+@@ -1349,13 +1349,13 @@ production: &base
  
    ## GitLab Elasticsearch settings
    elasticsearch:
@@ -75,7 +75,7 @@
  
    ## Webpack settings
    # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
-@@ -1371,18 +1371,18 @@ production: &base
+@@ -1376,18 +1376,18 @@ production: &base
  
      # Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq.
      sidekiq_exporter:
@@ -101,7 +101,7 @@
  
      # Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma.
      web_exporter:
-@@ -1609,13 +1609,13 @@ test:
+@@ -1614,13 +1614,13 @@ test:
          gitaly_address: unix:tmp/tests/gitaly/praefect.socket
  
    gitaly:
diff --git a/www/gitlab/files/patch-config_initializers_sprockets__patch.rb b/www/gitlab/files/patch-config_initializers_sprockets__patch.rb
deleted file mode 100644
index 8b031049c646..000000000000
--- a/www/gitlab/files/patch-config_initializers_sprockets__patch.rb
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/initializers/sprockets_patch.rb.orig	2024-09-24 23:32:11 UTC
-+++ config/initializers/sprockets_patch.rb
-@@ -8,7 +8,7 @@ require 'sprockets/utils'
- 
- require 'sprockets/utils'
- 
--unless Gem::Version.new(Sprockets::VERSION) == Gem::Version.new('3.7.2')
-+unless Gem::Version.new(Sprockets::VERSION) == Gem::Version.new('3.7.5')
-   raise 'New version of Sprockets detected. This patch can likely be removed.'
- end
- 
diff --git a/www/gitlab/files/patch-vendor_gems_bundler-checksum_bundler-checksum.gemspec b/www/gitlab/files/patch-gems_bundler-checksum_bundler-checksum.gemspec
index 915cd5764c09..4d5a8375456e 100644
--- a/www/gitlab/files/patch-vendor_gems_bundler-checksum_bundler-checksum.gemspec
+++ b/www/gitlab/files/patch-gems_bundler-checksum_bundler-checksum.gemspec
@@ -1,5 +1,5 @@
---- vendor/gems/bundler-checksum/bundler-checksum.gemspec.orig	2024-07-09 07:11:30 UTC
-+++ vendor/gems/bundler-checksum/bundler-checksum.gemspec
+--- gems/bundler-checksum/bundler-checksum.gemspec.orig	2025-07-16 16:34:28 UTC
++++ gems/bundler-checksum/bundler-checksum.gemspec
 @@ -14,8 +14,7 @@ Gem::Specification.new do |spec|
    spec.license       = 'MIT'
  
diff --git a/www/gitlab/pkg-message b/www/gitlab/pkg-message
index d736f45ba52d..743b768c3669 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.1-freebsd.md
+https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/install/18.2-freebsd.md
 EOM
   type: install
 }
@@ -18,9 +18,9 @@ EOM
 {
   message: <<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:
+switched from 18.1.x to 18.2.x, please follow the instructions in the guide at:
 
-https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/18.0-18.1-freebsd.md
+https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/18.1-18.2-freebsd.md
 
 If you just installed an minor upgrade of GitLab please follow
 the instructions in the guide at: