diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index a721b9b54a64..3ec4cc41ae1a 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1737619037
-SHA256 (go/devel_gitaly/gitaly-v17.8.1/go.mod) = 261a27c85b313537dc7204da0aff2b759da37364a91b8763e96194c7c7044d1d
-SIZE (go/devel_gitaly/gitaly-v17.8.1/go.mod) = 12398
-SHA256 (go/devel_gitaly/gitaly-v17.8.1/gitaly-v17.8.1.tar.bz2) = 791182392da8966834bcf07ef6b5c6dca3de4dedf15adf8c70ed62e1f4c2e579
-SIZE (go/devel_gitaly/gitaly-v17.8.1/gitaly-v17.8.1.tar.bz2) = 4400277
-SHA256 (go/devel_gitaly/gitaly-v17.8.1/git-v2.47.0.tar.bz2) = bda955065ff46d04f980a25858b45352e49de18f04d8dd319b6a681c55ee4529
-SIZE (go/devel_gitaly/gitaly-v17.8.1/git-v2.47.0.tar.bz2) = 8892022
+TIMESTAMP = 1739360745
+SHA256 (go/devel_gitaly/gitaly-v17.8.2/go.mod) = 261a27c85b313537dc7204da0aff2b759da37364a91b8763e96194c7c7044d1d
+SIZE (go/devel_gitaly/gitaly-v17.8.2/go.mod) = 12398
+SHA256 (go/devel_gitaly/gitaly-v17.8.2/gitaly-v17.8.2.tar.bz2) = 714afe39bee2e491f5b4b9853e4b664e75c392e0c4cf45dfcfa44c38e4b4e7a7
+SIZE (go/devel_gitaly/gitaly-v17.8.2/gitaly-v17.8.2.tar.bz2) = 4400841
+SHA256 (go/devel_gitaly/gitaly-v17.8.2/git-v2.47.0.tar.bz2) = bda955065ff46d04f980a25858b45352e49de18f04d8dd319b6a681c55ee4529
+SIZE (go/devel_gitaly/gitaly-v17.8.2/git-v2.47.0.tar.bz2) = 8892022
diff --git a/net/gitlab-agent/distinfo b/net/gitlab-agent/distinfo
index c5969318216c..3e2797b9d382 100644
--- a/net/gitlab-agent/distinfo
+++ b/net/gitlab-agent/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1737619039
-SHA256 (go/net_gitlab-agent/gitlab-agent-v17.8.1/v17.8.1.mod) = 4154ead7f7ea67f5b1a89eb211b9ceeea8a575e1d7739b66c084458f74e0c7f8
-SIZE (go/net_gitlab-agent/gitlab-agent-v17.8.1/v17.8.1.mod) = 10078
-SHA256 (go/net_gitlab-agent/gitlab-agent-v17.8.1/v17.8.1.zip) = 18f4ddea0b488ca599acd9fd4c924ed1730133eb06d5635a80aa7a42717d8763
-SIZE (go/net_gitlab-agent/gitlab-agent-v17.8.1/v17.8.1.zip) = 1572695
+TIMESTAMP = 1739360747
+SHA256 (go/net_gitlab-agent/gitlab-agent-v17.8.2/v17.8.2.mod) = 4154ead7f7ea67f5b1a89eb211b9ceeea8a575e1d7739b66c084458f74e0c7f8
+SIZE (go/net_gitlab-agent/gitlab-agent-v17.8.2/v17.8.2.mod) = 10078
+SHA256 (go/net_gitlab-agent/gitlab-agent-v17.8.2/v17.8.2.zip) = a053a7f8569bb91356ebf3a5d34c5a829d048a7d604409ed2be0f26d1b3d026d
+SIZE (go/net_gitlab-agent/gitlab-agent-v17.8.2/v17.8.2.zip) = 1572704
diff --git a/net/rubygem-gitlab-kas-grpc/distinfo b/net/rubygem-gitlab-kas-grpc/distinfo
index 433f44bad4e8..b6475d287e82 100644
--- a/net/rubygem-gitlab-kas-grpc/distinfo
+++ b/net/rubygem-gitlab-kas-grpc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1737619093
-SHA256 (rubygem/gitlab-kas-grpc-17.8.1.gem) = fbb9cf7411d12a7dc491d688a80a1d4064bd92dfbbadce523a549b07d26226e6
-SIZE (rubygem/gitlab-kas-grpc-17.8.1.gem) = 10752
+TIMESTAMP = 1739360798
+SHA256 (rubygem/gitlab-kas-grpc-17.8.2.gem) = 36cc6c7e2b954274819f07c83da4df20b941e425cc51bb58ff213c4640b65717
+SIZE (rubygem/gitlab-kas-grpc-17.8.2.gem) = 10752
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
index 8a45a107ab8b..a740e8b00e23 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1737619043
-SHA256 (go/www_gitlab-pages/gitlab-pages-v17.8.1/go.mod) = 0a2270c8237f0d394ca6409539d1e8639d5effb0ab9000cd13549aa0a53c7996
-SIZE (go/www_gitlab-pages/gitlab-pages-v17.8.1/go.mod) = 3464
-SHA256 (go/www_gitlab-pages/gitlab-pages-v17.8.1/gitlab-pages-v17.8.1.tar.bz2) = b336bb608271b9f79fb5407ed600a48aef5d293c1dd9cd903cbcdf7af3f9c599
-SIZE (go/www_gitlab-pages/gitlab-pages-v17.8.1/gitlab-pages-v17.8.1.tar.bz2) = 232458
+TIMESTAMP = 1739360749
+SHA256 (go/www_gitlab-pages/gitlab-pages-v17.8.2/go.mod) = 0a2270c8237f0d394ca6409539d1e8639d5effb0ab9000cd13549aa0a53c7996
+SIZE (go/www_gitlab-pages/gitlab-pages-v17.8.2/go.mod) = 3464
+SHA256 (go/www_gitlab-pages/gitlab-pages-v17.8.2/gitlab-pages-v17.8.2.tar.bz2) = a0febfc6eb92c19bfdd82ef44c37a8dcb6522bd435c69822503bc300939af4c7
+SIZE (go/www_gitlab-pages/gitlab-pages-v17.8.2/gitlab-pages-v17.8.2.tar.bz2) = 232399
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index 7903be6fad79..7ee8fae48bf1 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1737619092
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.8.1/go.mod) = 981ed1f4b3ca120ca4234c32a11114e8efa3acec171ff8265b91a00bc1707a54
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.8.1/go.mod) = 8008
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.8.1/gitlab-foss-v17.8.1.tar.bz2) = 8f1b5ef2ef4a09b0b092b9774b105b581d4756f9f39d15547366a41ca2a77293
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.8.1/gitlab-foss-v17.8.1.tar.bz2) = 113125235
+TIMESTAMP = 1739360797
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.8.2/go.mod) = 981ed1f4b3ca120ca4234c32a11114e8efa3acec171ff8265b91a00bc1707a54
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.8.2/go.mod) = 8008
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.8.2/gitlab-foss-v17.8.2.tar.bz2) = 5f622eb266bf5f1c54b45ccd45013aef633ffd2efd36ce48e37136742900c94c
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.8.2/gitlab-foss-v17.8.2.tar.bz2) = 113133209
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index faaf4720e7eb..26ecc7e92878 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,10 +1,10 @@
-GITLAB_VERSION=		17.8.1
-GITLAB_PORTREVISION=	2
+GITLAB_VERSION=		17.8.2
+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.47.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 20dce3a82266..c9d1ac5ca867 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1737618974
-SHA256 (gitlab-foss-v17.8.1.tar.bz2) = 8f1b5ef2ef4a09b0b092b9774b105b581d4756f9f39d15547366a41ca2a77293
-SIZE (gitlab-foss-v17.8.1.tar.bz2) = 113125235
-TIMESTAMP = 1737619028
-SHA256 (gitlab-v17.8.1-ee.tar.bz2) = 419d64c57c1bf153be6e427bf4c6a0ad49c4ff6d0e55973cb2ff26233c8f4a19
-SIZE (gitlab-v17.8.1-ee.tar.bz2) = 123952694
+TIMESTAMP = 1739360685
+SHA256 (gitlab-foss-v17.8.2.tar.bz2) = 5f622eb266bf5f1c54b45ccd45013aef633ffd2efd36ce48e37136742900c94c
+SIZE (gitlab-foss-v17.8.2.tar.bz2) = 113133209
+TIMESTAMP = 1739360737
+SHA256 (gitlab-v17.8.2-ee.tar.bz2) = 733cb729573887c5626a47f5da6fd926773f4f83abdedc4c2865d49ebc1e7a0b
+SIZE (gitlab-v17.8.2-ee.tar.bz2) = 123994127
diff --git a/www/gitlab/files/patch-config_application.rb b/www/gitlab/files/patch-config_application.rb
new file mode 100644
index 000000000000..9099b1d3a7ab
--- /dev/null
+++ b/www/gitlab/files/patch-config_application.rb
@@ -0,0 +1,14 @@
+--- config/application.rb.orig	2025-02-13 06:21:36 UTC
++++ config/application.rb
+@@ -1,6 +1,11 @@ require_relative 'boot'
+ # frozen_string_literal: true
+ require_relative 'boot'
+ 
++# Required as rubygem-concurrent-ruby version 1.3.5 has remove logger, but is required by active_support
++# The fix has only applied to rails 7.1 and 7.2
++# https://github.com/rails/rails/pull/49372
++require "logger"
++
+ # Based on https://github.com/rails/rails/blob/v6.0.1/railties/lib/rails/all.rb
+ # Only load the railties we need instead of loading everything
+ require 'rails'