aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG.md16
1 files changed, 8 insertions, 8 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index e101f0919e..92c20ec79f 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,5 +1,13 @@
## Rails 6.0.0.alpha (Unreleased) ##
+* Fix `#columsn_for_distinct` of MySQL and PostgreSQL to make
+ `ActiveRecord::FinderMethods#limited_ids_for` use correct primary key values
+ even if `ORDER BY` columns include other table's primary key.
+
+ Fixes #28364.
+
+ *Takumi Kagiyama*
+
* Make `reflection.klass` raise if `polymorphic?` not to be misused.
Fixes #31876.
@@ -23,13 +31,5 @@
*DHH*
-* Fix `#columsn_for_distinct` of MySQL and PostgreSQL to make
- `ActiveRecord::FinderMethods#limited_ids_for` use correct primary key values
- even if `ORDER BY` columns include other table's primary key.
-
- Fixes #28364.
-
- *Takumi Kagiyama*
-
Please check [5-2-stable](https://github.com/rails/rails/blob/5-2-stable/activerecord/CHANGELOG.md) for previous changes.