1 files changed, 91 insertions, 13 deletions

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index f5b8026c52..3dd973d64b 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,8 +1,86 @@
-*   Fixed a problem where `sum`, `size`, `average`, `minimum` and `maximum`
-    used with a grouping was not returning a Hash.
+*   When a `group` is set, `sum`, `size`, `average`, `minimum` and `maximum`
+    on a NullRelation should return a Hash.
 
     *Kuldeep Aggarwal*
 
+*   Fixed serialized fields returning serialized data after being updated with
+    `update_column`.
+
+    *Simon Hørup Eskildsen*
+
+*   Fixed polymorphic eager loading when using a String as foreign key.
+
+    Fixes #14734.
+
+    *Lauro Caetano*
+
+*   Change belongs_to touch to be consistent with timestamp updates
+
+    If a model is set up with a belongs_to: touch relatinoship the parent
+    record will only be touched if the record was modified. This makes it
+    consistent with timestamp updating on the record itself.
+
+    *Brock Trappitt*
+
+*   Fixed the inferred table name of a HABTM auxiliar table inside a schema.
+
+    Fixes #14824
+
+    *Eric Chahin*
+
+*   Remove unused `:timestamp` type. Transparently alias it to `:datetime`
+    in all cases. Fixes inconsistencies when column types are sent outside of
+    `ActiveRecord`, such as for XML Serialization.
+
+    *Sean Griffin*
+
+*   Fix bug that added `table_name_prefix` and `table_name_suffix` to
+    extension names in PostgreSQL when migrating.
+
+    *Joao Carlos*
+
+*   The `:index` option in migrations, which previously was only available for
+    `references`, now works with any column types.
+
+    *Marc Schütz*
+
+*   Add support for counter name to be passed as parameter on `CounterCache::ClassMethods#reset_counters`.
+
+    *jnormore*
+
+*   Restrict deletion of record when using `delete_all` with `uniq`, `group`, `having`
+    or `offset`.
+
+    In these cases the generated query ignored them and that caused unintended
+    records to be deleted.
+
+    Fixes #11985.
+
+    *Leandro Facchinetti*
+
+*   Floats with limit >= 25 that get turned into doubles in MySQL no longer have
+    their limit dropped from the schema.
+
+    Fixes #14135.
+
+    *Aaron Nelson*
+
+*   Fix how to calculate associated class name when using namespaced `has_and_belongs_to_many`
+    association.
+
+    Fixes #14709.
+
+    *Kassio Borges*
+
+*   `ActiveRecord::Relation::Merger#filter_binds` now compares equivalent symbols and
+    strings in column names as equal.
+
+    This fixes a rare case in which more bind values are passed than there are
+    placeholders for them in the generated SQL statement, which can make PostgreSQL
+    throw a `StatementInvalid` exception.
+
+    *Nat Budin*
+
 *   Fix `stored_attributes` to correctly merge the details of stored
     attributes defined in parent classes.
 
@@ -28,13 +106,13 @@
 *   Fix `PostgreSQLAdapter::OID::Float#type_cast` to convert Infinity and
     NaN PostgreSQL values into a native Ruby `Float::INFINITY` and `Float::NAN`
 
-    Example:
+    Before:
 
-        # Before
         Point.create(value: 1.0/0)
         Point.last.value # => 0.0
 
-        # After
+    After:
+
         Point.create(value: 1.0/0)
         Point.last.value # => Infinity
 
@@ -60,7 +138,7 @@
     HABTM should fall back to using the normal CollectionAssociation's size
     calculation if the collection is not cached or loaded.
 
-    Fixes #14913 and #14914.
+    Fixes #14913, #14914.
 
     *Fred Wu*
 
@@ -262,7 +340,7 @@
 
 *   Auto-generate stable fixture UUIDs on PostgreSQL.
 
-    Fixes: #11524
+    Fixes #11524.
 
     *Roderick van Domburg*
 
@@ -380,12 +458,6 @@
 
     *Cody Cutrer*, *Steve Rice*, *Rafael Mendonça Franca*
 
-*   Save `has_one` association even if the record doesn't changed.
-
-    Fixes #14407.
-
-    *Rafael Mendonça França*
-
 *   Use singular table name in generated migrations when
     `ActiveRecord::Base.pluralize_table_names` is `false`.
 
@@ -464,6 +536,12 @@
 
     *Troy Kruthoff*, *Lachlan Sylvester*
 
+*   Only save has_one associations if record has changes.
+    Previously after save related callbacks, such as `#after_commit`, were triggered when the has_one
+    object did not get saved to the db.
+
+    *Alan Kennedy*
+
 *   Allow strings to specify the `#order` value.
 
     Example: