aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2008-05-11 23:50:08 +0100
committerPratik Naik <pratiknaik@gmail.com>2008-05-11 23:50:08 +0100
commitcb50a2880759f311148abda55ab60be772b8aa51 (patch)
tree3f8f851f332c0976349de9dc2b4a722946b4cc5e /activerecord/CHANGELOG
parent35634feb474cc55fbc95edeffe98cec241d45f23 (diff)
parent9a137506a1267ec5938fcec4d2ff135f15037459 (diff)
downloadrails-cb50a2880759f311148abda55ab60be772b8aa51.tar.gz
rails-cb50a2880759f311148abda55ab60be772b8aa51.tar.bz2
rails-cb50a2880759f311148abda55ab60be772b8aa51.zip
Merge commit 'mainstream/master'
Diffstat (limited to 'activerecord/CHANGELOG')
-rw-r--r--activerecord/CHANGELOG4
1 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 264ea79d4a..4a130bf5c0 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,9 @@
*SVN*
+* Ensure hm:t preloading honours reflection options. Resolves #137. [Frederick Cheung]
+
+* Added protection against duplicate migration names (Aslak Hellesøy) [#112]
+
* Base#instantiate_time_object: eliminate check for Time.zone, since we can assume this is set if time_zone_aware_attributes is set to true [Geoff Buesing]
* Time zone aware attribute methods use Time.zone.parse instead of #to_time for String arguments, so that offset information in String is respected. Resolves #105. [Scott Fleckenstein, Geoff Buesing]