From 9dbc4754540a7374ad04b406bb0f6e97b7719479 Mon Sep 17 00:00:00 2001
From: Ryuta Kamizono <kamipo@gmail.com>
Date: Wed, 28 Feb 2018 20:45:35 +0900
Subject: Remove CHANGELOG entries which were backported to 5-2-stable

---
 activerecord/CHANGELOG.md | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'activerecord')

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 227f93c6a1..325c4abfc8 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,19 +1,5 @@
 ## Rails 6.0.0.alpha (Unreleased) ##
 
-*   Fix `#columns_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.
-
-    *Ryuta Kamizono*
-
 *   Rails 6 requires Ruby 2.4.1 or newer.
 
     *Jeremy Daer*
-- 
cgit v1.2.3