From e466fc45cade7cbc0ee5a0e7181e377dd3780043 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Thu, 8 Dec 2005 04:44:54 +0000
Subject: Fixed that using :include together with :conditions array in
 Base.find would cause NoMethodError (closes #2887) [Paul Hammmond]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3240 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 activerecord/CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'activerecord/CHANGELOG')

diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 7fe0f3ae9b..e4ab429e6a 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Fixed that using :include together with :conditions array in Base.find would cause NoMethodError #2887 [Paul Hammmond]
+
 * PostgreSQL: more robust sequence name discovery.  #3087 [Rick Olson]
 
 * Oracle: use syntax compatible with Oracle 8.  #3131 [Michael Schoen]
-- 
cgit v1.2.3