1 files changed, 72 insertions, 6 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 503a029aac..c255f59b00 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,9 +1,76 @@
-*   Test that PostgreSQL adapter includes `usec` when quoting `DateTime` objects
+*   Migration dump UUID default functions to schema.rb.
 
-    *Ben Cherry*
+    Fixes #10751.
 
-*   Fix PredicateBuilder so polymorhic association keys in `where` clause can
-    also accept not only `ActiveRecord::Base` direct descendances (decorated
+    *kennyj*
+
+*   Fixed a bug in `ActiveRecord::Associations::CollectionAssociation#find_by_scan`
+    when using `has_many` association with `:inverse_of` option and UUID primary key.
+
+    Fixes #10450.
+
+    *kennyj*
+
+*   ActiveRecord::Base#<=> has been removed.  Primary keys may not be in order,
+    or even be numbers, so sorting by id doesn't make sense.  Please use `sort_by`
+    and specify the attribute you wish to sort with.  For example, change:
+
+      Post.all.to_a.sort
+
+    to:
+
+      Post.all.to_a.sort_by(&:id)
+
+    *Aaron Patterson*
+
+*   Fix: joins association, with defined in the scope block constraints by using several
+    where constraints and at least of them is not `Arel::Nodes::Equality`,
+    generates invalid SQL expression.
+
+    Fixes: #11963
+
+    *Paul Nikitochkin*
+
+*   Deprecate the delegation of Array bang methods for associations.
+    To use them, instead first call `#to_a` on the association to access the
+    array to be acted on.
+
+    *Ben Woosley*
+
+*   `CollectionAssociation#first`/`#last` (e.g. `has_many`) use a `LIMIT`ed
+    query to fetch results rather than loading the entire collection.
+
+    *Lann Martin*
+
+*   Make possible to run SQLite rake tasks without the `Rails` constant defined.
+
+    *Damien Mathieu*
+
+*   Allow Relation#from to accept other relations with bind values.
+
+    *Ryan Wallace*
+
+*   Fix inserts with prepared statements disabled.
+
+    Fixes #12023.
+
+    *Rafael Mendonça França*
+
+*   Setting a has_one association on a new record no longer causes an empty
+    transaction.
+
+    *Dylan Thacker-Smith*
+
+*   Fix `AR::Relation#merge` sometimes failing to preserve `readonly(false)` flag.
+
+    *thedarkone*
+
+*   Re-use `order` argument pre-processing for `reorder`.
+
+    *Paul Nikitochkin*
+
+*   Fix PredicateBuilder so polymorphic association keys in `where` clause can
+    accept objects other than direct descendants of `ActiveRecord::Base` (decorated
     models, for example).
 
     *Mikhail Dieterle*
@@ -12,7 +79,7 @@
     parentheses (eg. `($1.25) # => -1.25`)).
     Fixes #11899.
 
-    * Yves Senn*
+    *Yves Senn*
 
 *   Stop interpreting SQL 'string' columns as :string type because there is no
     common STRING datatype in SQL.
@@ -28,7 +95,6 @@
     Example:
 
         record = User.new
-
         record.logged_in_from_ip # is type of an inet or a cidr
 
         # Before: