From 4f606b410ff877fceaecbb33ea9b53f3132f7ab1 Mon Sep 17 00:00:00 2001
From: Igor Drozdov <idrozdov@gitlab.com>
Date: Tue, 4 Jul 2023 09:46:46 +0200
Subject: [PATCH] Upgrade Rails to 7.0.6

Updates Rails to the latest version
---
 Gemfile                                       |   2 +-
 Gemfile.checksum                              |  26 ++---
 Gemfile.lock                                  | 108 +++++++++---------
 ee/spec/requests/groups_controller_spec.rb    |   2 +-
 package.json                                  |   4 +-
 ...s+7.0.5-1.patch => @rails+ujs+7.0.6.patch} |   0
 .../api/admin/instance_clusters_spec.rb       |   2 +-
 spec/requests/api/group_clusters_spec.rb      |   2 +-
 spec/requests/api/project_clusters_spec.rb    |   2 +-
 .../runners/register_runner_service_spec.rb   |   4 +-
 vendor/gems/attr_encrypted/Gemfile.lock       |  26 ++---
 .../attr_encrypted/attr_encrypted.gemspec     |   2 +-
 yarn.lock                                     |  18 +--
 13 files changed, 99 insertions(+), 99 deletions(-)
 rename patches/{@rails+ujs+7.0.5-1.patch => @rails+ujs+7.0.6.patch} (100%)

diff --git a/Gemfile b/Gemfile
index 082d158071b42..6e674afb537ca 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,7 +15,7 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', requir
 # 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 'rails', '~> 7.0.6'
 
 gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab'
 
diff --git a/Gemfile.checksum b/Gemfile.checksum
index c7f776d4c11e3..ae7fbe634a968 100644
--- a/Gemfile.checksum
+++ b/Gemfile.checksum
@@ -2,18 +2,18 @@
 {"name":"CFPropertyList","version":"3.0.5","platform":"ruby","checksum":"a78551cd4768d78ebca98488c27e33652ef818be64697a54676d34e6434674a4"},
 {"name":"RedCloth","version":"4.3.2","platform":"ruby","checksum":"1ee7bc55c8dcec92cf7741a2132a9a6cd19e4b884fbc1b3aca23e1a4fcd92d55"},
 {"name":"acme-client","version":"2.0.11","platform":"ruby","checksum":"edf6da9f3c5dbe3ab0c6738eb3b97978b7a60e3500445480d2a72fcc610089de"},
-{"name":"actioncable","version":"7.0.5.1","platform":"ruby","checksum":"89f420e2f8c17dab36dbda15b68f56f06857a212990ef479ebd56400dd7b7151"},
-{"name":"actionmailbox","version":"7.0.5.1","platform":"ruby","checksum":"2b9c2383e9e8ba43021def31dc18f36d4a9fc8b9aaca051c73d35e93ea7b565f"},
-{"name":"actionmailer","version":"7.0.5.1","platform":"ruby","checksum":"f586bc7ffea720c7c4e6db03542c37d05e0bb853642258fc65b687de2e36e2df"},
-{"name":"actionpack","version":"7.0.5.1","platform":"ruby","checksum":"5ecf346ec710be317519ee80ee35ca18dd5a56705300fe20eab87dde1b3b7e00"},
-{"name":"actiontext","version":"7.0.5.1","platform":"ruby","checksum":"5496d78c5cf1b340310edd4faa0ebd7918ea2ce4c6d873d9d75f43ba4b3d851a"},
-{"name":"actionview","version":"7.0.5.1","platform":"ruby","checksum":"8abf5776b092a01357f220af1690556cb5b7599bb2fd82d444c38dbf19be3086"},
-{"name":"activejob","version":"7.0.5.1","platform":"ruby","checksum":"0359420e5d7397fb0e5d8e4cfb0cd053f284a487a493c4ac7e69b56f82eb9387"},
-{"name":"activemodel","version":"7.0.5.1","platform":"ruby","checksum":"9e0478c87c80c9126d4354b797fa639469463b4edf2ef2f47b4668a23b4cc889"},
-{"name":"activerecord","version":"7.0.5.1","platform":"ruby","checksum":"261d249e8a3a7a268cb5f94741d6f081735969c0cd0ccaecf380e94ab5c0cde9"},
+{"name":"actioncable","version":"7.0.6","platform":"ruby","checksum":"ac88be1e287cd9f228e6d4c0884278790210e59eaa23b603f58025183a66e2b4"},
+{"name":"actionmailbox","version":"7.0.6","platform":"ruby","checksum":"083ac338246640b13cb10c93777fe734e30ce89f82411f46b3929e7c9bf3b38b"},
+{"name":"actionmailer","version":"7.0.6","platform":"ruby","checksum":"33b442a99408d4b96558365ce92debb6c53204f8eaa8237741c594e7640ca107"},
+{"name":"actionpack","version":"7.0.6","platform":"ruby","checksum":"6c659afbffdbb32323df1d44882830206f5d7dc81ed3d840736ac39c5ae0c634"},
+{"name":"actiontext","version":"7.0.6","platform":"ruby","checksum":"d459eff29352433f5963bd191ff2e22a74cb6b21c2edbed09aef57f01074fe2e"},
+{"name":"actionview","version":"7.0.6","platform":"ruby","checksum":"a7224aca85e7be32997a3e6f12cf96fb529b14b6ec00fbaf4aa25df96e828ec5"},
+{"name":"activejob","version":"7.0.6","platform":"ruby","checksum":"78148bf1f0f011b5d9c8ed66d787728a174cb01a20cebc5e0f2a8352cce25cbd"},
+{"name":"activemodel","version":"7.0.6","platform":"ruby","checksum":"5231fe572d7599237b6b2a4987ebf439d028754a529227630777dd3d1ad8511c"},
+{"name":"activerecord","version":"7.0.6","platform":"ruby","checksum":"38ff1e7bbf57132fe78abf3809e8fe9392b54d00df31ce8972f47bb806b119d0"},
 {"name":"activerecord-explain-analyze","version":"0.1.0","platform":"ruby","checksum":"5debb11fe23f35b91953a80677d80ba9284ee737fd9d148c1d7603ce45217f7b"},
-{"name":"activestorage","version":"7.0.5.1","platform":"ruby","checksum":"92d41073a1c183a1c851e784db6b31a820eeb08575fc45fdf1a12192b7edef3d"},
-{"name":"activesupport","version":"7.0.5.1","platform":"ruby","checksum":"0c64283eb5dd6b2fec8577e0daca91d8d40d15c68bd1f1abf92c552a9b513a54"},
+{"name":"activestorage","version":"7.0.6","platform":"ruby","checksum":"9270183f7fee6ab4677b079a85ec2abeb041b2a7207c49dd81b5965c46dad50c"},
+{"name":"activesupport","version":"7.0.6","platform":"ruby","checksum":"d3abba6b15d8fd7af07f3322c370f00eb8ce6715fb714436342999628c705ab2"},
 {"name":"acts-as-taggable-on","version":"9.0.0","platform":"ruby","checksum":"5a409be0eae125b7b02c1a7316264b40d4a583584a13d4ea4a6d82acdb351b86"},
 {"name":"addressable","version":"2.8.1","platform":"ruby","checksum":"bc724a176ef02118c8a3ed6b5c04c39cf59209607ffcce77b91d0261dbadedfa"},
 {"name":"aes_key_wrap","version":"1.1.0","platform":"ruby","checksum":"b935f4756b37375895db45669e79dfcdc0f7901e12d4e08974d5540c8e0776a5"},
@@ -480,12 +480,12 @@
 {"name":"rack-proxy","version":"0.7.6","platform":"ruby","checksum":"8704c5009bb60eb16dacf4bcc5e067a8484e668321e8443534bb58ded320c2a8"},
 {"name":"rack-test","version":"2.1.0","platform":"ruby","checksum":"0c61fc61904049d691922ea4bb99e28004ed3f43aa5cfd495024cc345f125dfb"},
 {"name":"rack-timeout","version":"0.6.3","platform":"ruby","checksum":"1754892eacc124d405e7f1145731ec9b7421ebd1bee5d51ddc18b72c204d0ab3"},
-{"name":"rails","version":"7.0.5.1","platform":"ruby","checksum":"f7cd6e19037789f0c7e9f2452aaf384aa02c09eefb929a704861fc2d34755c9f"},
+{"name":"rails","version":"7.0.6","platform":"ruby","checksum":"5dfbd481a23556ad425fc8541399a129a08ed550f877294b44d0170ca5b9f421"},
 {"name":"rails-controller-testing","version":"1.0.5","platform":"ruby","checksum":"741448db59366073e86fc965ba403f881c636b79a2c39a48d0486f2607182e94"},
 {"name":"rails-dom-testing","version":"2.0.3","platform":"ruby","checksum":"b140c4f39f6e609c8113137b9a60dfc2ecb89864e496f87f23a68b3b8f12d8d1"},
 {"name":"rails-html-sanitizer","version":"1.5.0","platform":"ruby","checksum":"bf326075e8a968cd882c30b15a4c9100059be3af2356093dc68324ec3bd9ea79"},
 {"name":"rails-i18n","version":"7.0.3","platform":"ruby","checksum":"e3158e98c5332d129fd5131f171ac575eb30dbb8919b21595382b08850cf2bd3"},
-{"name":"railties","version":"7.0.5.1","platform":"ruby","checksum":"5190e0ae084fc227bf044dedc70f68c51ff986f3a5d7939efeb144d216c694fc"},
+{"name":"railties","version":"7.0.6","platform":"ruby","checksum":"fb0ee3c7a3beea7f4b353c655f9a055c31ca36c3a2a565afaed415baca5c8a35"},
 {"name":"rainbow","version":"3.1.1","platform":"ruby","checksum":"039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a"},
 {"name":"rake","version":"13.0.6","platform":"ruby","checksum":"5ce4bf5037b4196c24ac62834d8db1ce175470391026bd9e557d669beeb19097"},
 {"name":"rb-fsevent","version":"0.11.2","platform":"ruby","checksum":"43900b972e7301d6570f64b850a5aa67833ee7d87b458ee92805d56b7318aefe"},
diff --git a/Gemfile.lock b/Gemfile.lock
index 984bceae521ca..c17687aa156b9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -129,70 +129,70 @@ GEM
     acme-client (2.0.11)
       faraday (>= 1.0, < 3.0.0)
       faraday-retry (~> 1.0)
-    actioncable (7.0.5.1)
-      actionpack (= 7.0.5.1)
-      activesupport (= 7.0.5.1)
+    actioncable (7.0.6)
+      actionpack (= 7.0.6)
+      activesupport (= 7.0.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.5.1)
-      actionpack (= 7.0.5.1)
-      activejob (= 7.0.5.1)
-      activerecord (= 7.0.5.1)
-      activestorage (= 7.0.5.1)
-      activesupport (= 7.0.5.1)
+    actionmailbox (7.0.6)
+      actionpack (= 7.0.6)
+      activejob (= 7.0.6)
+      activerecord (= 7.0.6)
+      activestorage (= 7.0.6)
+      activesupport (= 7.0.6)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.5.1)
-      actionpack (= 7.0.5.1)
-      actionview (= 7.0.5.1)
-      activejob (= 7.0.5.1)
-      activesupport (= 7.0.5.1)
+    actionmailer (7.0.6)
+      actionpack (= 7.0.6)
+      actionview (= 7.0.6)
+      activejob (= 7.0.6)
+      activesupport (= 7.0.6)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.5.1)
-      actionview (= 7.0.5.1)
-      activesupport (= 7.0.5.1)
+    actionpack (7.0.6)
+      actionview (= 7.0.6)
+      activesupport (= 7.0.6)
       rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.5.1)
-      actionpack (= 7.0.5.1)
-      activerecord (= 7.0.5.1)
-      activestorage (= 7.0.5.1)
-      activesupport (= 7.0.5.1)
+    actiontext (7.0.6)
+      actionpack (= 7.0.6)
+      activerecord (= 7.0.6)
+      activestorage (= 7.0.6)
+      activesupport (= 7.0.6)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.5.1)
-      activesupport (= 7.0.5.1)
+    actionview (7.0.6)
+      activesupport (= 7.0.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.5.1)
-      activesupport (= 7.0.5.1)
+    activejob (7.0.6)
+      activesupport (= 7.0.6)
       globalid (>= 0.3.6)
-    activemodel (7.0.5.1)
-      activesupport (= 7.0.5.1)
-    activerecord (7.0.5.1)
-      activemodel (= 7.0.5.1)
-      activesupport (= 7.0.5.1)
+    activemodel (7.0.6)
+      activesupport (= 7.0.6)
+    activerecord (7.0.6)
+      activemodel (= 7.0.6)
+      activesupport (= 7.0.6)
     activerecord-explain-analyze (0.1.0)
       activerecord (>= 4)
       pg
-    activestorage (7.0.5.1)
-      actionpack (= 7.0.5.1)
-      activejob (= 7.0.5.1)
-      activerecord (= 7.0.5.1)
-      activesupport (= 7.0.5.1)
+    activestorage (7.0.6)
+      actionpack (= 7.0.6)
+      activejob (= 7.0.6)
+      activerecord (= 7.0.6)
+      activesupport (= 7.0.6)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.5.1)
+    activesupport (7.0.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -1234,20 +1234,20 @@ GEM
     rack-test (2.1.0)
       rack (>= 1.3)
     rack-timeout (0.6.3)
-    rails (7.0.5.1)
-      actioncable (= 7.0.5.1)
-      actionmailbox (= 7.0.5.1)
-      actionmailer (= 7.0.5.1)
-      actionpack (= 7.0.5.1)
-      actiontext (= 7.0.5.1)
-      actionview (= 7.0.5.1)
-      activejob (= 7.0.5.1)
-      activemodel (= 7.0.5.1)
-      activerecord (= 7.0.5.1)
-      activestorage (= 7.0.5.1)
-      activesupport (= 7.0.5.1)
+    rails (7.0.6)
+      actioncable (= 7.0.6)
+      actionmailbox (= 7.0.6)
+      actionmailer (= 7.0.6)
+      actionpack (= 7.0.6)
+      actiontext (= 7.0.6)
+      actionview (= 7.0.6)
+      activejob (= 7.0.6)
+      activemodel (= 7.0.6)
+      activerecord (= 7.0.6)
+      activestorage (= 7.0.6)
+      activesupport (= 7.0.6)
       bundler (>= 1.15.0)
-      railties (= 7.0.5.1)
+      railties (= 7.0.6)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -1260,9 +1260,9 @@ GEM
     rails-i18n (7.0.3)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (7.0.5.1)
-      actionpack (= 7.0.5.1)
-      activesupport (= 7.0.5.1)
+    railties (7.0.6)
+      actionpack (= 7.0.6)
+      activesupport (= 7.0.6)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -1933,7 +1933,7 @@ DEPENDENCIES
   rack-oauth2 (~> 1.21.3)
   rack-proxy (~> 0.7.6)
   rack-timeout (~> 0.6.3)
-  rails (~> 7.0.5.1)
+  rails (~> 7.0.6)
   rails-controller-testing
   rails-i18n (~> 7.0)
   rainbow (~> 3.0)
diff --git a/ee/spec/requests/groups_controller_spec.rb b/ee/spec/requests/groups_controller_spec.rb
index 993f68674ac36..faadd8fc4a2a9 100644
--- a/ee/spec/requests/groups_controller_spec.rb
+++ b/ee/spec/requests/groups_controller_spec.rb
@@ -150,7 +150,7 @@
           expect { subject }
             .not_to change { group.reload.ip_restrictions.count }.from(0)
           expect(response).to have_gitlab_http_status(:ok)
-          expect(response.body).to include('Ip restrictions base IP subnet restriction only allowed for top-level groups')
+          expect(response.body).to include('Ip restrictions IP subnet restriction only allowed for top-level groups')
         end
       end
 
diff --git a/package.json b/package.json
index 342b5c872ae56..331d9a32f813a 100644
--- a/package.json
+++ b/package.json
@@ -62,8 +62,8 @@
     "@gitlab/web-ide": "0.0.1-dev-20230620122149",
     "@mattiasbuelens/web-streams-adapter": "^0.1.0",
     "@popperjs/core": "^2.11.2",
-    "@rails/actioncable": "7.0.5-1",
-    "@rails/ujs": "7.0.5-1",
+    "@rails/actioncable": "7.0.6",
+    "@rails/ujs": "7.0.6",
     "@snowplow/browser-plugin-client-hints": "^3.9.0",
     "@snowplow/browser-plugin-form-tracking": "^3.9.0",
     "@snowplow/browser-plugin-ga-cookies": "^3.9.0",
diff --git a/patches/@rails+ujs+7.0.5-1.patch b/patches/@rails+ujs+7.0.6.patch
similarity index 100%
rename from patches/@rails+ujs+7.0.5-1.patch
rename to patches/@rails+ujs+7.0.6.patch
diff --git a/spec/requests/api/admin/instance_clusters_spec.rb b/spec/requests/api/admin/instance_clusters_spec.rb
index f2e62533b78ec..6fad020150c02 100644
--- a/spec/requests/api/admin/instance_clusters_spec.rb
+++ b/spec/requests/api/admin/instance_clusters_spec.rb
@@ -363,7 +363,7 @@
           end
 
           it 'returns validation error' do
-            expect(json_response['message']['platform_kubernetes.base'].first).to eq(_('Cannot modify managed Kubernetes cluster'))
+            expect(json_response['message']['platform_kubernetes'].first).to eq(_('Cannot modify managed Kubernetes cluster'))
           end
         end
 
diff --git a/spec/requests/api/group_clusters_spec.rb b/spec/requests/api/group_clusters_spec.rb
index 58d0e6a1eb5d3..7c194627f8274 100644
--- a/spec/requests/api/group_clusters_spec.rb
+++ b/spec/requests/api/group_clusters_spec.rb
@@ -453,7 +453,7 @@
           end
 
           it 'returns validation error' do
-            expect(json_response['message']['platform_kubernetes.base'].first).to eq(_('Cannot modify managed Kubernetes cluster'))
+            expect(json_response['message']['platform_kubernetes'].first).to eq(_('Cannot modify managed Kubernetes cluster'))
           end
         end
 
diff --git a/spec/requests/api/project_clusters_spec.rb b/spec/requests/api/project_clusters_spec.rb
index c52948a4cb09a..99c190757ca96 100644
--- a/spec/requests/api/project_clusters_spec.rb
+++ b/spec/requests/api/project_clusters_spec.rb
@@ -443,7 +443,7 @@
 
           it 'returns validation error' do
             expect(response).to have_gitlab_http_status(:bad_request)
-            expect(json_response['message']['platform_kubernetes.base'].first)
+            expect(json_response['message']['platform_kubernetes'].first)
               .to eq(_('Cannot modify managed Kubernetes cluster'))
           end
         end
diff --git a/spec/services/ci/runners/register_runner_service_spec.rb b/spec/services/ci/runners/register_runner_service_spec.rb
index b59217733647e..7252763c13e19 100644
--- a/spec/services/ci/runners/register_runner_service_spec.rb
+++ b/spec/services/ci/runners/register_runner_service_spec.rb
@@ -173,7 +173,7 @@
           expect(runner).to be_an_instance_of(::Ci::Runner)
           expect(runner.persisted?).to be_falsey
           expect(runner.errors.messages).to eq(
-            'runner_projects.base': ['Maximum number of ci registered project runners (1) exceeded']
+            runner_projects: ['Maximum number of ci registered project runners (1) exceeded']
           )
           expect(project.runners.reload.size).to eq(1)
         end
@@ -252,7 +252,7 @@
           expect(runner).to be_an_instance_of(::Ci::Runner)
           expect(runner.persisted?).to be_falsey
           expect(runner.errors.messages).to eq(
-            'runner_namespaces.base': ['Maximum number of ci registered group runners (1) exceeded']
+            runner_namespaces: ['Maximum number of ci registered group runners (1) exceeded']
           )
           expect(group.runners.reload.size).to eq(1)
         end
diff --git a/vendor/gems/attr_encrypted/Gemfile.lock b/vendor/gems/attr_encrypted/Gemfile.lock
index 1c42ec10a2c74..ac362d2625e2a 100644
--- a/vendor/gems/attr_encrypted/Gemfile.lock
+++ b/vendor/gems/attr_encrypted/Gemfile.lock
@@ -7,25 +7,25 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.0.5.1)
-      actionview (= 7.0.5.1)
-      activesupport (= 7.0.5.1)
+    actionpack (7.0.6)
+      actionview (= 7.0.6)
+      activesupport (= 7.0.6)
       rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.5.1)
-      activesupport (= 7.0.5.1)
+    actionview (7.0.6)
+      activesupport (= 7.0.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activemodel (7.0.5.1)
-      activesupport (= 7.0.5.1)
-    activerecord (7.0.5.1)
-      activemodel (= 7.0.5.1)
-      activesupport (= 7.0.5.1)
-    activesupport (7.0.5.1)
+    activemodel (7.0.6)
+      activesupport (= 7.0.6)
+    activerecord (7.0.6)
+      activemodel (= 7.0.6)
+      activesupport (= 7.0.6)
+    activesupport (7.0.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -136,8 +136,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack (~> 7.0.5.1)
-  activerecord (~> 7.0.5.1)
+  actionpack (~> 7.0.6)
+  activerecord (~> 7.0.6)
   attr_encrypted!
   codeclimate-test-reporter (<= 0.6.0)
   datamapper
diff --git a/vendor/gems/attr_encrypted/attr_encrypted.gemspec b/vendor/gems/attr_encrypted/attr_encrypted.gemspec
index 189c5c96f4e76..026fe84034d9b 100644
--- a/vendor/gems/attr_encrypted/attr_encrypted.gemspec
+++ b/vendor/gems/attr_encrypted/attr_encrypted.gemspec
@@ -31,7 +31,7 @@ Forked from https://github.com/attr-encrypted/attr_encrypted."
 
   s.add_dependency('encryptor', ['~> 3.0.0'])
 
-  activerecord_version = "~> 7.0.5.1"
+  activerecord_version = "~> 7.0.6"
   s.add_development_dependency('activerecord', activerecord_version)
   s.add_development_dependency('actionpack', activerecord_version)
   s.add_development_dependency('datamapper')
diff --git a/yarn.lock b/yarn.lock
index 68e0478eabb51..37e0716fd8d23 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1705,15 +1705,15 @@
   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.5.tgz#db5a11bf66bdab39569719555b0f76e138d7bd64"
   integrity sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==
 
-"@rails/actioncable@7.0.5-1":
-  version "7.0.5-1"
-  resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.0.5-1.tgz#900ef463774b94d81d1b5fca5cf4d0fa40aec6c2"
-  integrity sha512-Dj/VTnMTUfLSqXI1+t7nmDs1wODu08mF8Ct6H4WjRxDjmgCp/OPI5x8WWdm1IEdlQApfcuMX2/UVpttKdJUFpA==
-
-"@rails/ujs@7.0.5-1":
-  version "7.0.5-1"
-  resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-7.0.5-1.tgz#d73baa07f53da9875b5ac32b1a38bab32bdde970"
-  integrity sha512-GsD/zYWf2jCfyoNE5rf/ftgHi6RxBugHB3gycWYsMkXXsKX05tS+iDw0/45syvyFr5TwZ0YmfEXd5H+oRNG7Gg==
+"@rails/actioncable@7.0.6":
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.0.6.tgz#60765c8e9c357a0ba0840fb1e409caedc233ea0d"
+  integrity sha512-ybBsUrIsu5geM8BtqnpM7ZA9D8uzSz+e1B4JR57NaCmasHKWap6AX5DT7NHIbp21opVet1qqoVSdsoLDqXeB2A==
+
+"@rails/ujs@7.0.6":
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-7.0.6.tgz#fd8937c92335f3da9495e07292511ad5f7547a6a"
+  integrity sha512-s5v3AC6AywOIFMz0RIMW83Xc8FPIvKMkP3ZHFlM4ISNkhdUwP9HdhVtxxo6z3dIhe9vI0Our2A8kN/QpUV02Qg==
 
 "@remirror/core-constants@^2.0.0":
   version "2.0.0"
-- 
GitLab