1 files changed, 56 insertions, 3 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 5ffbed28f6..c1c511a65c 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,56 @@
+*   When using `Relation#or`, extract the common conditions and put them before the OR condition.
+
+    *Maxime Handfield Lapointe*
+
+*   `Relation#or` now accepts two relations who have different values for
+    `references` only, as `references` can be implicitly called by `where`.
+
+    Fixes #29411.
+
+    *Sean Griffin*
+
+*   `ApplicationRecord` is no longer generated when generating models. If you
+    need to generate it, it can be created with `rails g application_record`.
+
+    *Lisa Ugray*
+
+*   Fix `COUNT(DISTINCT ...)` with `ORDER BY` and `LIMIT` to keep the existing select list.
+
+    *Ryuta Kamizono*
+
+*   When a `has_one` association is destroyed by `dependent: destroy`,
+    `destroyed_by_association` will now be set to the reflection, matching the
+    behaviour of `has_many` associations.
+
+    *Lisa Ugray*
+
+*   Fix `unscoped(where: [columns])` removing the wrong bind values
+
+    When the `where` is called on a relation after a `or`, unscoping the column of that later `where` removed
+    bind values used by the `or` instead. (possibly other cases too)
+
+    ```
+    Post.where(id: 1).or(Post.where(id: 2)).where(foo: 3).unscope(where: :foo).to_sql
+    # Currently:
+    #     SELECT "posts".* FROM "posts" WHERE ("posts"."id" = 2 OR "posts"."id" = 3)
+    # With fix:
+    #     SELECT "posts".* FROM "posts" WHERE ("posts"."id" = 1 OR "posts"."id" = 2)
+    ```
+
+    *Maxime Handfield Lapointe*
+
+*   Values constructed using multi-parameter assignment will now use the
+    post-type-cast value for rendering in single-field form inputs.
+
+    *Sean Griffin*
+
+*   `Relation#joins` is no longer affected by the target model's
+    `current_scope`, with the exception of `unscoped`.
+
+    Fixes #29338.
+
+    *Sean Griffin*
+
 *   Change sqlite3 boolean serialization to use 1 and 0
 
     SQLite natively recognizes 1 and 0 as true and false, but does not natively
@@ -30,7 +83,7 @@
 
 *   Fix transactions to apply state to child transactions
 
-    Previously if you had a nested transaction and the outer transaction was rolledback the record from the
+    Previously, if you had a nested transaction and the outer transaction was rolledback, the record from the
     inner transaction would still be marked as persisted.
 
     This change fixes that by applying the state of the parent transaction to the child transaction when the
@@ -96,7 +149,7 @@
 
     *Kir Shatrov*
 
-*   Prevent making bind param if casted value is nil.
+*   Prevent creation of bind param if casted value is nil.
 
     *Ryuta Kamizono*
 
@@ -157,7 +210,7 @@
 
     *bogdanvlviv*
 
-*   When calling the dynamic fixture accessor method with no arguments it now returns all fixtures of this type.
+*   When calling the dynamic fixture accessor method with no arguments, it now returns all fixtures of this type.
     Previously this method always returned an empty array.
 
     *Kevin McPhillips*