1 files changed, 28 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index d9966f0ad7..c78ddd5fe6 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,31 @@
+*   When a table has a composite primary key, the `primary_key` method for
+    SQLite3 and PostgreSQL adapters was only returning the first field of the key.
+    Ensures that it will return nil instead, as Active Record doesn't support
+    composite primary keys.
+
+    Fixes #18070.
+
+    *arthurnn*
+
+*   `validates_size_of` / `validates_length_of` do not count records,
+    which are `marked_for_destruction?`.
+
+    Fixes #7247.
+
+    *Yves Senn*
+
+*   Ensure `first!` and friends work on loaded associations.
+
+    Fixes #18237.
+
+    *Sean Griffin*
+
+*   `eager_load` preserves readonly flag for associations.
+
+    Closes #15853.
+
+    *Takashi Kokubun*
+
 *   Provide `:touch` option to `save()` to accommodate saving without updating
     timestamps.