Merge branch 'trix-7-0' into 7-0-stable

rafaelfranca · rafaelfranca · commit 891f7933f097 · 2024-05-17T19:55:50.000Z
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -31,90 +31,90 @@ GIT
 PATH
   remote: .
   specs:
-    actioncable (7.0.8.2)
-      actionpack (= 7.0.8.2)
-      activesupport (= 7.0.8.2)
+    actioncable (7.0.8.3)
+      actionpack (= 7.0.8.3)
+      activesupport (= 7.0.8.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.8.2)
-      actionpack (= 7.0.8.2)
-      activejob (= 7.0.8.2)
-      activerecord (= 7.0.8.2)
-      activestorage (= 7.0.8.2)
-      activesupport (= 7.0.8.2)
+    actionmailbox (7.0.8.3)
+      actionpack (= 7.0.8.3)
+      activejob (= 7.0.8.3)
+      activerecord (= 7.0.8.3)
+      activestorage (= 7.0.8.3)
+      activesupport (= 7.0.8.3)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.8.2)
-      actionpack (= 7.0.8.2)
-      actionview (= 7.0.8.2)
-      activejob (= 7.0.8.2)
-      activesupport (= 7.0.8.2)
+    actionmailer (7.0.8.3)
+      actionpack (= 7.0.8.3)
+      actionview (= 7.0.8.3)
+      activejob (= 7.0.8.3)
+      activesupport (= 7.0.8.3)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.8.2)
-      actionview (= 7.0.8.2)
-      activesupport (= 7.0.8.2)
+    actionpack (7.0.8.3)
+      actionview (= 7.0.8.3)
+      activesupport (= 7.0.8.3)
       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.8.2)
-      actionpack (= 7.0.8.2)
-      activerecord (= 7.0.8.2)
-      activestorage (= 7.0.8.2)
-      activesupport (= 7.0.8.2)
+    actiontext (7.0.8.3)
+      actionpack (= 7.0.8.3)
+      activerecord (= 7.0.8.3)
+      activestorage (= 7.0.8.3)
+      activesupport (= 7.0.8.3)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.8.2)
-      activesupport (= 7.0.8.2)
+    actionview (7.0.8.3)
+      activesupport (= 7.0.8.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.8.2)
-      activesupport (= 7.0.8.2)
+    activejob (7.0.8.3)
+      activesupport (= 7.0.8.3)
       globalid (>= 0.3.6)
-    activemodel (7.0.8.2)
-      activesupport (= 7.0.8.2)
-    activerecord (7.0.8.2)
-      activemodel (= 7.0.8.2)
-      activesupport (= 7.0.8.2)
-    activestorage (7.0.8.2)
-      actionpack (= 7.0.8.2)
-      activejob (= 7.0.8.2)
-      activerecord (= 7.0.8.2)
-      activesupport (= 7.0.8.2)
+    activemodel (7.0.8.3)
+      activesupport (= 7.0.8.3)
+    activerecord (7.0.8.3)
+      activemodel (= 7.0.8.3)
+      activesupport (= 7.0.8.3)
+    activestorage (7.0.8.3)
+      actionpack (= 7.0.8.3)
+      activejob (= 7.0.8.3)
+      activerecord (= 7.0.8.3)
+      activesupport (= 7.0.8.3)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.8.2)
+    activesupport (7.0.8.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    rails (7.0.8.2)
-      actioncable (= 7.0.8.2)
-      actionmailbox (= 7.0.8.2)
-      actionmailer (= 7.0.8.2)
-      actionpack (= 7.0.8.2)
-      actiontext (= 7.0.8.2)
-      actionview (= 7.0.8.2)
-      activejob (= 7.0.8.2)
-      activemodel (= 7.0.8.2)
-      activerecord (= 7.0.8.2)
-      activestorage (= 7.0.8.2)
-      activesupport (= 7.0.8.2)
+    rails (7.0.8.3)
+      actioncable (= 7.0.8.3)
+      actionmailbox (= 7.0.8.3)
+      actionmailer (= 7.0.8.3)
+      actionpack (= 7.0.8.3)
+      actiontext (= 7.0.8.3)
+      actionview (= 7.0.8.3)
+      activejob (= 7.0.8.3)
+      activemodel (= 7.0.8.3)
+      activerecord (= 7.0.8.3)
+      activestorage (= 7.0.8.3)
+      activesupport (= 7.0.8.3)
       bundler (>= 1.15.0)
-      railties (= 7.0.8.2)
-    railties (7.0.8.2)
-      actionpack (= 7.0.8.2)
-      activesupport (= 7.0.8.2)
+      railties (= 7.0.8.3)
+    railties (7.0.8.3)
+      actionpack (= 7.0.8.3)
+      activesupport (= 7.0.8.3)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
diff --git a/RAILS_VERSION b/RAILS_VERSION
@@ -1 +1 @@
-7.0.8.2
+7.0.8.3
diff --git a/actioncable/CHANGELOG.md b/actioncable/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 7.0.8.3 (May 17, 2024) ##
+
+*   No changes.
+
+
 ## Rails 7.0.8.2 (May 16, 2024) ##
 
 *   No changes.
diff --git a/actioncable/lib/action_cable/gem_version.rb b/actioncable/lib/action_cable/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 7
     MINOR = 0
     TINY  = 8
-    PRE   = "2"
+    PRE   = "3"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
diff --git a/actioncable/package.json b/actioncable/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rails/actioncable",
-  "version": "7.0.8-2",
+  "version": "7.0.8-3",
   "description": "WebSocket framework for Ruby on Rails.",
   "module": "app/assets/javascripts/actioncable.esm.js",
   "main": "app/assets/javascripts/actioncable.js",
diff --git a/actionmailbox/CHANGELOG.md b/actionmailbox/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 7.0.8.3 (May 17, 2024) ##
+
+*   No changes.
+
+
 ## Rails 7.0.8.2 (May 16, 2024) ##
 
 *   No changes.
diff --git a/actionmailbox/lib/action_mailbox/gem_version.rb b/actionmailbox/lib/action_mailbox/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 7
     MINOR = 0
     TINY  = 8
-    PRE   = "2"
+    PRE   = "3"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 7.0.8.3 (May 17, 2024) ##
+
+*   No changes.
+
+
 ## Rails 7.0.8.2 (May 16, 2024) ##
 
 *   No changes.
diff --git a/actionmailer/lib/action_mailer/gem_version.rb b/actionmailer/lib/action_mailer/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 7
     MINOR = 0
     TINY  = 8
-    PRE   = "2"
+    PRE   = "3"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
@@ -11,6 +11,11 @@
     *Hartley McGuire*
 
 
+## Rails 7.0.8.3 (May 17, 2024) ##
+
+*   No changes.
+
+
 ## Rails 7.0.8.2 (May 16, 2024) ##
 
 *   No changes.
diff --git a/actionpack/lib/action_pack/gem_version.rb b/actionpack/lib/action_pack/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 7
     MINOR = 0
     TINY  = 8
-    PRE   = "2"
+    PRE   = "3"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
diff --git a/actiontext/CHANGELOG.md b/actiontext/CHANGELOG.md
@@ -1,3 +1,5 @@
+## Rails 7.0.8.3 (May 17, 2024) ##
+
 *   Fix vendored trix.css to be correct file.
 
     *Hartley McGuire*
diff --git a/actiontext/lib/action_text/gem_version.rb b/actiontext/lib/action_text/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 7
     MINOR = 0
     TINY  = 8
-    PRE   = "2"
+    PRE   = "3"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
diff --git a/actiontext/package.json b/actiontext/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rails/actiontext",
-  "version": "7.0.8-2",
+  "version": "7.0.8-3",
   "description": "Edit and display rich text in Rails applications",
   "main": "app/assets/javascripts/actiontext.js",
   "type": "module",
@@ -25,13 +25,13 @@
     "@rails/activestorage": ">= 7.0.0-alpha1"
   },
   "peerDependencies": {
-    "trix": "^2.0.0"
+    "trix": "^1.3.1"
   },
   "devDependencies": {
     "@rollup/plugin-node-resolve": "^11.0.1",
     "@rollup/plugin-commonjs": "^19.0.1",
     "rollup": "^2.35.1",
-    "trix": "^2.0.0"
+    "trix": "^1.3.1"
   },
   "scripts": {
     "build": "rollup --config rollup.config.js"
diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
@@ -3,6 +3,11 @@
     *Earlopain*
 
 
+## Rails 7.0.8.3 (May 17, 2024) ##
+
+*   No changes.
+
+
 ## Rails 7.0.8.2 (May 16, 2024) ##
 
 *   No changes.
diff --git a/actionview/lib/action_view/gem_version.rb b/actionview/lib/action_view/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 7
     MINOR = 0
     TINY  = 8
-    PRE   = "2"
+    PRE   = "3"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
diff --git a/actionview/package.json b/actionview/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rails/ujs",
-  "version": "7.0.8-2",
+  "version": "7.0.8-3",
   "description": "Ruby on Rails unobtrusive scripting adapter",
   "main": "lib/assets/compiled/rails-ujs.js",
   "files": [
diff --git a/activejob/CHANGELOG.md b/activejob/CHANGELOG.md
@@ -3,6 +3,11 @@
     *Joshua Young*
 
 
+## Rails 7.0.8.3 (May 17, 2024) ##
+
+*   No changes.
+
+
 ## Rails 7.0.8.2 (May 16, 2024) ##
 
 *   No changes.
diff --git a/activejob/lib/active_job/gem_version.rb b/activejob/lib/active_job/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 7
     MINOR = 0
     TINY  = 8
-    PRE   = "2"
+    PRE   = "3"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 7.0.8.3 (May 17, 2024) ##
+
+*   No changes.
+
+
 ## Rails 7.0.8.2 (May 16, 2024) ##
 
 *   No changes.
diff --git a/activemodel/lib/active_model/gem_version.rb b/activemodel/lib/active_model/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 7
     MINOR = 0
     TINY  = 8
-    PRE   = "2"
+    PRE   = "3"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
@@ -65,6 +65,11 @@
     *Felix Tscheulin*
 
 
+## Rails 7.0.8.3 (May 17, 2024) ##
+
+*   No changes.
+
+
 ## Rails 7.0.8.2 (May 16, 2024) ##
 
 *   No changes.
diff --git a/activerecord/lib/active_record/gem_version.rb b/activerecord/lib/active_record/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 7
     MINOR = 0
     TINY  = 8
-    PRE   = "2"
+    PRE   = "3"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
diff --git a/activestorage/CHANGELOG.md b/activestorage/CHANGELOG.md
@@ -26,6 +26,11 @@
     *Russell Porter*
 
 
+## Rails 7.0.8.3 (May 17, 2024) ##
+
+*   No changes.
+
+
 ## Rails 7.0.8.2 (May 16, 2024) ##
 
 *   No changes.
diff --git a/activestorage/lib/active_storage/gem_version.rb b/activestorage/lib/active_storage/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 7
     MINOR = 0
     TINY  = 8
-    PRE   = "2"
+    PRE   = "3"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
diff --git a/activestorage/package.json b/activestorage/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rails/activestorage",
-  "version": "7.0.8-2",
+  "version": "7.0.8-3",
   "description": "Attach cloud and local files in Rails applications",
   "module": "app/assets/javascripts/activestorage.esm.js",
   "main": "app/assets/javascripts/activestorage.js",
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
@@ -45,6 +45,11 @@
     *Nobuyoshi Nakada*, *Shouichi Kamiya*, *Hartley McGuire*
 
 
+## Rails 7.0.8.3 (May 17, 2024) ##
+
+*   No changes.
+
+
 ## Rails 7.0.8.2 (May 16, 2024) ##
 
 *   No changes.
diff --git a/activesupport/lib/active_support/gem_version.rb b/activesupport/lib/active_support/gem_version.rb
diff --git a/guides/CHANGELOG.md b/guides/CHANGELOG.md
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
diff --git a/railties/lib/rails/gem_version.rb b/railties/lib/rails/gem_version.rb
diff --git a/version.rb b/version.rb
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@rails/actioncable",`
`3`		`- "version": "7.0.8-2",`
	`3`	`+ "version": "7.0.8-3",`
`4`	`4`	`"description": "WebSocket framework for Ruby on Rails.",`
`5`	`5`	`"module": "app/assets/javascripts/actioncable.esm.js",`
`6`	`6`	`"main": "app/assets/javascripts/actioncable.js",`