aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG.md14
1 files changed, 8 insertions, 6 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index b9acf6847c..5ba7a6fa75 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,13 +1,15 @@
## Rails 4.0.0 (unreleased) ##
-* Fix a SystemStackError problem when using time zone aware or serialized attributes.
- In current implementation, we re-use `column_types` argument when initiating an instance.
- If an instance have serialized or timezone aware attributes,
- column_types is wrapped multiple times in `decorate_columns` method. Thus the above error occurs.
+* Allow to use databases.rake tasks without having `Rails.application`.
- *Dan Erikson & kennyj*
+ *Piotr Sarnacki*
+
+* Fix a `SystemStackError` problem when using time zone aware or serialized attributes.
+ In current implementation, we reuse `column_types` argument when initiating an instance.
+ If an instance has serialized or time zone aware attributes, `column_types` is
+ wrapped multiple times in `decorate_columns` method. Thus the above error occurs.
-* Allow to use databases.rake tasks without having Rails.application *Piotr Sarnacki*
+ *Dan Erikson & kennyj*
* Fix for a regression bug in which counter cache columns were not being updated
when record was pushed into a has_many association. For example: