From 511850b94ddcca12e19321bf4046d69c43ceb1c0 Mon Sep 17 00:00:00 2001
From: Heinrich Lee Yu <heinrich@gitlab.com>
Date: Tue, 27 Jun 2023 15:43:30 +0800
Subject: [PATCH] Upgrade to Rails 7.0.5.1
Updates Rails to the latest version
---
Gemfile | 2 +-
Gemfile.checksum | 26 ++---
Gemfile.lock | 108 +++++++++---------
package.json | 4 +-
...s+7.0.5.patch => @rails+ujs+7.0.5-1.patch} | 0
vendor/gems/attr_encrypted/Gemfile.lock | 28 ++---
.../attr_encrypted/attr_encrypted.gemspec | 2 +-
yarn.lock | 18 +--
8 files changed, 94 insertions(+), 94 deletions(-)
rename patches/{@rails+ujs+7.0.5.patch => @rails+ujs+7.0.5-1.patch} (100%)
diff --git a/Gemfile b/Gemfile
index d746892802ee1..fe6a1ff02f10e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,7 +13,7 @@ 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
-gem 'rails', '~> 7.0.5'
+gem 'rails', '~> 7.0.5.1'
gem 'bootsnap', '~> 1.16.0', require: false
diff --git a/Gemfile.checksum b/Gemfile.checksum
index c3a99c8782c5a..328e656a0a5fb 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","platform":"ruby","checksum":"f2d15f6845b7e929961723e0e62555c3c4585fc7d24f0b1ebadc246296e62c00"},
-{"name":"actionmailbox","version":"7.0.5","platform":"ruby","checksum":"91d57e6e3fac581014b51777daa68875fa42e72039a14489c2c846397c072935"},
-{"name":"actionmailer","version":"7.0.5","platform":"ruby","checksum":"2527c2fdb8358a48f98629a1544e2f01eb21f1c5555d772fa21be0056940690c"},
-{"name":"actionpack","version":"7.0.5","platform":"ruby","checksum":"1c129019b3c59b799f5946c9dfde1f8f47f1a60985d86fa4a0fc4c837f3ce170"},
-{"name":"actiontext","version":"7.0.5","platform":"ruby","checksum":"81e59a7b5f05ce45c0b341ea378aebed6ef49d55d1090c0f24f419bc2094972d"},
-{"name":"actionview","version":"7.0.5","platform":"ruby","checksum":"4221e2381cf5eff9637f3466bc112ab0171c18f0b7a833b73c3c8d4155db1dfc"},
-{"name":"activejob","version":"7.0.5","platform":"ruby","checksum":"fb988160c19b1f7606908e664bacbd72c70ada2704c3e5c4441e3dba4fecfaa1"},
-{"name":"activemodel","version":"7.0.5","platform":"ruby","checksum":"510bcf2033f463cc59c310c3972bd475fda31acab6dfcfb469824a437b984b32"},
-{"name":"activerecord","version":"7.0.5","platform":"ruby","checksum":"542e800fe3ade7cec04d979f7ac47b9a546dc3788e89122bb4918602c65fa013"},
+{"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":"activerecord-explain-analyze","version":"0.1.0","platform":"ruby","checksum":"5debb11fe23f35b91953a80677d80ba9284ee737fd9d148c1d7603ce45217f7b"},
-{"name":"activestorage","version":"7.0.5","platform":"ruby","checksum":"281375a68b0ddcccc2b5fc8982e6fa524d885f92c6a7395f56adce3cba19e255"},
-{"name":"activesupport","version":"7.0.5","platform":"ruby","checksum":"d58f62bf992ffe1c0efdaedc6edf1a94fdd3cfcecbca80098de587514c2cf3b0"},
+{"name":"activestorage","version":"7.0.5.1","platform":"ruby","checksum":"92d41073a1c183a1c851e784db6b31a820eeb08575fc45fdf1a12192b7edef3d"},
+{"name":"activesupport","version":"7.0.5.1","platform":"ruby","checksum":"0c64283eb5dd6b2fec8577e0daca91d8d40d15c68bd1f1abf92c552a9b513a54"},
{"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","platform":"ruby","checksum":"57ef2baa4a1f5f954bc6e5a019b1fac8486ece36f79c1cf366e6de33210637fe"},
+{"name":"rails","version":"7.0.5.1","platform":"ruby","checksum":"f7cd6e19037789f0c7e9f2452aaf384aa02c09eefb929a704861fc2d34755c9f"},
{"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","platform":"ruby","checksum":"dcf38098623cf03e7d99fee50954a0f664307b0358cc00ad5c6759094067c34e"},
+{"name":"railties","version":"7.0.5.1","platform":"ruby","checksum":"5190e0ae084fc227bf044dedc70f68c51ff986f3a5d7939efeb144d216c694fc"},
{"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 395293f17a200..f6d7dc58cd48d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -115,70 +115,70 @@ GEM
acme-client (2.0.11)
faraday (>= 1.0, < 3.0.0)
faraday-retry (~> 1.0)
- actioncable (7.0.5)
- actionpack (= 7.0.5)
- activesupport (= 7.0.5)
+ actioncable (7.0.5.1)
+ actionpack (= 7.0.5.1)
+ activesupport (= 7.0.5.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
- actionmailbox (7.0.5)
- actionpack (= 7.0.5)
- activejob (= 7.0.5)
- activerecord (= 7.0.5)
- activestorage (= 7.0.5)
- activesupport (= 7.0.5)
+ 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)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
- actionmailer (7.0.5)
- actionpack (= 7.0.5)
- actionview (= 7.0.5)
- activejob (= 7.0.5)
- activesupport (= 7.0.5)
+ 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)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
- actionpack (7.0.5)
- actionview (= 7.0.5)
- activesupport (= 7.0.5)
+ actionpack (7.0.5.1)
+ actionview (= 7.0.5.1)
+ activesupport (= 7.0.5.1)
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)
- actionpack (= 7.0.5)
- activerecord (= 7.0.5)
- activestorage (= 7.0.5)
- activesupport (= 7.0.5)
+ 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)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
- actionview (7.0.5)
- activesupport (= 7.0.5)
+ 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)
- activejob (7.0.5)
- activesupport (= 7.0.5)
+ activejob (7.0.5.1)
+ activesupport (= 7.0.5.1)
globalid (>= 0.3.6)
- activemodel (7.0.5)
- activesupport (= 7.0.5)
- activerecord (7.0.5)
- activemodel (= 7.0.5)
- activesupport (= 7.0.5)
+ 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)
activerecord-explain-analyze (0.1.0)
activerecord (>= 4)
pg
- activestorage (7.0.5)
- actionpack (= 7.0.5)
- activejob (= 7.0.5)
- activerecord (= 7.0.5)
- activesupport (= 7.0.5)
+ 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)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
- activesupport (7.0.5)
+ activesupport (7.0.5.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
@@ -1220,20 +1220,20 @@ GEM
rack-test (2.1.0)
rack (>= 1.3)
rack-timeout (0.6.3)
- rails (7.0.5)
- actioncable (= 7.0.5)
- actionmailbox (= 7.0.5)
- actionmailer (= 7.0.5)
- actionpack (= 7.0.5)
- actiontext (= 7.0.5)
- actionview (= 7.0.5)
- activejob (= 7.0.5)
- activemodel (= 7.0.5)
- activerecord (= 7.0.5)
- activestorage (= 7.0.5)
- activesupport (= 7.0.5)
+ 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)
bundler (>= 1.15.0)
- railties (= 7.0.5)
+ railties (= 7.0.5.1)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
actionview (>= 5.0.1.rc1)
@@ -1246,9 +1246,9 @@ GEM
rails-i18n (7.0.3)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 8)
- railties (7.0.5)
- actionpack (= 7.0.5)
- activesupport (= 7.0.5)
+ railties (7.0.5.1)
+ actionpack (= 7.0.5.1)
+ activesupport (= 7.0.5.1)
method_source
rake (>= 12.2)
thor (~> 1.0)
@@ -1914,7 +1914,7 @@ DEPENDENCIES
rack-oauth2 (~> 1.21.3)
rack-proxy (~> 0.7.6)
rack-timeout (~> 0.6.3)
- rails (~> 7.0.5)
+ rails (~> 7.0.5.1)
rails-controller-testing
rails-i18n (~> 7.0)
rainbow (~> 3.0)
diff --git a/package.json b/package.json
index 76f3bf4aefd36..0c8bf91d08f31 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",
- "@rails/ujs": "7.0.5",
+ "@rails/actioncable": "7.0.5-1",
+ "@rails/ujs": "7.0.5-1",
"@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.patch b/patches/@rails+ujs+7.0.5-1.patch
similarity index 100%
rename from patches/@rails+ujs+7.0.5.patch
rename to patches/@rails+ujs+7.0.5-1.patch
diff --git a/vendor/gems/attr_encrypted/Gemfile.lock b/vendor/gems/attr_encrypted/Gemfile.lock
index 02eff672425fa..1c42ec10a2c74 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.4.1)
- actionview (= 7.0.4.1)
- activesupport (= 7.0.4.1)
- rack (~> 2.0, >= 2.2.0)
+ actionpack (7.0.5.1)
+ actionview (= 7.0.5.1)
+ activesupport (= 7.0.5.1)
+ 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.4.1)
- activesupport (= 7.0.4.1)
+ 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)
- activemodel (7.0.4.1)
- activesupport (= 7.0.4.1)
- activerecord (7.0.4.1)
- activemodel (= 7.0.4.1)
- activesupport (= 7.0.4.1)
- activesupport (7.0.4.1)
+ 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)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
@@ -136,8 +136,8 @@ PLATFORMS
ruby
DEPENDENCIES
- actionpack (~> 7.0.4)
- activerecord (~> 7.0.4)
+ actionpack (~> 7.0.5.1)
+ activerecord (~> 7.0.5.1)
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 cb12541b5d88f..189c5c96f4e76 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.4"
+ activerecord_version = "~> 7.0.5.1"
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 9ce8fe3ccbed7..60a7919178859 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":
- version "7.0.5"
- resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.0.5.tgz#bbc11203e0d3d5084002abfcf01d621fdf5f3a9d"
- integrity sha512-SOBA2heB9lTw0VYIx8M/ed7inSf4I9sR8OIlJprhgkfQ3WJtrxPJ6DDATR1Z3RYaIR7HlT2Olj08v1lfGIGuHA==
-
-"@rails/ujs@7.0.5":
- version "7.0.5"
- resolved "https://registry.yarnpkg.com/@rails/ujs/-/ujs-7.0.5.tgz#d35a71fe6ecd4ab88bbe4bc6c2f287c992c2de4c"
- integrity sha512-/wQ6v4DGxhxflPWoLwGkOQoKbtIXx/LsVNKd8shRM+/HXxlVBEb+F5znN99TlxX8e/R3dN6anTPAqA+mfA5YtQ==
+"@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==
"@remirror/core-constants@^2.0.0":
version "2.0.0"
--
GitLab