diff --git a/Gemfile b/Gemfile
index 3f5faba5ad17138c33996d812247085837d8d74d..6e24999b3a3aae5dae663007c77028b7b18fd37a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,6 +13,8 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', requir
 # NOTE: When incrementing the major or minor version here, also increment activerecord_version
 # in vendor/gems/attr_encrypted/attr_encrypted.gemspec until we resolve
 # https://gitlab.com/gitlab-org/gitlab/-/issues/375713
+#
+# See https://docs.gitlab.com/ee/development/gemfile.html#upgrade-rails for guidelines when upgrading Rails
 gem 'rails', '~> 7.0.5.1'
 
 gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab'
diff --git a/doc/development/gemfile.md b/doc/development/gemfile.md
index e6275068ea87d20b7ede4c7a5b47dcf595d28c3c..3971a66f796f665660c4549b4ae16416eb4f5bae 100644
--- a/doc/development/gemfile.md
+++ b/doc/development/gemfile.md
@@ -118,6 +118,7 @@ Read more about [Gems development guidelines](gems.md).
 
 When upgrading the Rails gem and its dependencies, you also should update the following:
 
+- The [`activerecord_version` in the vendored `attr_encrypted` gemspec](https://gitlab.com/gitlab-org/gitlab/-/blob/master/vendor/gems/attr_encrypted/attr_encrypted.gemspec).
 - The [`Gemfile` in the `qa` directory](https://gitlab.com/gitlab-org/gitlab/-/blob/master/qa/Gemfile).
 - The [`Gemfile` in Gitaly Ruby](https://gitlab.com/gitlab-org/gitaly/-/blob/master/ruby/Gemfile),
   to ensure that we ship only one version of these gems.
diff --git a/qa/Gemfile b/qa/Gemfile
index a0136c5dd975af5e98acaa97d88f7256e27d8761..2599d79cb6464fcc4e4b44c707bcf072096aff99 100644
--- a/qa/Gemfile
+++ b/qa/Gemfile
@@ -5,7 +5,7 @@ source 'https://rubygems.org'
 gem 'gitlab-qa', '~> 12', require: 'gitlab/qa'
 gem 'gitlab_quality-test_tooling', '~> 0.8.2', require: false
 gem 'gitlab-utils', path: '../gems/gitlab-utils'
-gem 'activesupport', '~> 6.1.7.2' # This should stay in sync with the root's Gemfile
+gem 'activesupport', '~> 7.0.5.1' # This should stay in sync with the root's Gemfile
 gem 'allure-rspec', '~> 2.20.0'
 gem 'capybara', '~> 3.39.2'
 gem 'capybara-screenshot', '~> 1.0.26'
diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock
index b84b51ad83b37e40df3e440afcb61fe8ab19c0e3..b5422ca7458f1a9c7b168b598b9bc9f1304596d4 100644
--- a/qa/Gemfile.lock
+++ b/qa/Gemfile.lock
@@ -11,18 +11,17 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionview (6.1.7.2)
-      activesupport (= 6.1.7.2)
+    actionview (7.0.5.1)
+      activesupport (= 7.0.5.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activesupport (6.1.7.2)
+    activesupport (7.0.5.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
     airborne (0.3.7)
@@ -207,7 +206,7 @@ GEM
     mime-types-data (3.2023.0218.1)
     mini_mime (1.1.0)
     mini_portile2 (2.8.2)
-    minitest (5.18.0)
+    minitest (5.18.1)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     netrc (0.11.0)
@@ -336,7 +335,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 6.1.7.2)
+  activesupport (~> 7.0.5.1)
   airborne (~> 0.3.7)
   allure-rspec (~> 2.20.0)
   capybara (~> 3.39.2)