From 209f3b30af1beffbf1cd2fd933c3453661239b07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Tue, 20 Oct 2015 15:30:09 -0200
Subject: [PATCH] Add CHANGELOG entry for fix of #21955 [ci skip]

---
 activerecord/CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 9e44131fa9f..efb3ffebaf3 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,9 @@
+*   Fix `rewhere` in a `has_many` association.
+
+    Fixes #21955.
+
+    *Josh Branchaud*, *Kal*
+
 *   `where` raises ArgumentError on unsupported types.
 
     Fixes #20473.