aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-08-24 03:36:48 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-08-24 03:36:48 +0000
commit4b4dd5408228c342f36bfd8290d39de2cf7bbd71 (patch)
tree0466f73aa20813cdec2ca3c08ce73ac8f1458631 /activerecord/CHANGELOG
parentd65a8f6e9ee5b2c0d81a61983649bd8c431ca4d4 (diff)
downloadrails-4b4dd5408228c342f36bfd8290d39de2cf7bbd71.tar.gz
rails-4b4dd5408228c342f36bfd8290d39de2cf7bbd71.tar.bz2
rails-4b4dd5408228c342f36bfd8290d39de2cf7bbd71.zip
Clashing type columns due to a sloppy join shouldn't wreck single-table inheritance. Closes #5838.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4813 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/CHANGELOG')
-rw-r--r--activerecord/CHANGELOG2
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index e83b737528..649655b6a8 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Clashing type columns due to a sloppy join shouldn't wreck single-table inheritance. #5838 [Kevin Clark]
+
* Fixtures: correct escaping of \n and \r. #5859 [evgeny.zislis@gmail.com]
* Migrations: gracefully handle missing migration files. #5857 [eli.gordon@gmail.com]