4 files changed, 24 insertions, 14 deletions
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index 864063c1365a..ff68c32fb6f9 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,4 +1,4 @@
-GITLAB_VERSION=		18.1.1
+GITLAB_VERSION=		18.1.2
 GITLAB_PORTREVISION=	0
 
 # Git version gitaly should use (from gitlab mirror)
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index f3d977a2ab27..33b5475934e2 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1750904269
-SHA256 (gitlab-foss-v18.1.1.tar.bz2) = f88fcf557bad4ed378c12b2cca9321e6014d4aae4426ddb6cde185a6ecb54d11
-SIZE (gitlab-foss-v18.1.1.tar.bz2) = 119445108
-TIMESTAMP = 1750904310
-SHA256 (gitlab-v18.1.1-ee.tar.bz2) = e2b052cee4fff6330558b78ac6efd3619681b95b7dd949961267c1370aecdd21
-SIZE (gitlab-v18.1.1-ee.tar.bz2) = 134748693
+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
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index 704da6697d22..b1f8737fef56 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig	2025-06-18 04:18:20 UTC
+--- Gemfile.orig	2025-07-09 01:48:55 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
@@ -182,16 +182,21 @@
  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,7 +518,7 @@ gem 'gitaly', '~> 18.1.0.pre.rc1', feature_category: :
+@@ -646,11 +518,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 'grpc', '~> 1.72.0', feature_category: :shared
+ # Lock until 1.74.0 is available
+ # https://gitlab.com/gitlab-com/gl-infra/production/-/issues/20067
+-gem 'grpc', '= 1.63.0', feature_category: :shared
++gem 'grpc', '~> 1.63', feature_category: :shared
  
-@@ -669,7 +541,7 @@ gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :
+ gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared
+ 
+@@ -671,7 +543,7 @@ gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :
  gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :shared
  
  # Countries list
@@ -200,7 +205,7 @@
  
  gem 'retriable', '~> 3.1.2', feature_category: :shared
  
-@@ -750,10 +622,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
+@@ -752,10 +624,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
  
  gem 'duo_api', '~> 1.3', feature_category: :system_access
  
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 cf08a9593f99..8912856cee2b 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-06-18 04:18:20 UTC
+--- gems/gitlab-backup-cli/gitlab-backup-cli.gemspec.orig	2025-07-09 01:48:55 UTC
 +++ gems/gitlab-backup-cli/gitlab-backup-cli.gemspec
 @@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
    spec.add_dependency "activerecord", ">= 7"
@@ -9,7 +9,12 @@
    spec.add_dependency "google-cloud-storage_transfer", "~> 1.2.0"
    spec.add_dependency "mutex_m", "~> 0.3"
    spec.add_dependency "pg", "~> 1.5.6"
-@@ -44,7 +44,7 @@ Gem::Specification.new do |spec|
+@@ -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"
    spec.add_dependency "json", "~> 2.7"
    spec.add_dependency "jwt", "~> 2.5"
    spec.add_dependency "logger", "~> 1.5"