aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md10
1 files changed, 10 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 33d94e29bc..08aa3aae34 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,5 +1,15 @@
## Rails 4.0.0 (unreleased) ##
+* Removed `:finder_sql` and `:counter_sql` collection association options. Please
+ use scopes instead.
+
+ *Jon Leighton*
+
+* Removed `:insert_sql` and `:delete_sql` `has_and_belongs_to_many`
+ association options. Please use `has_many :through` instead.
+
+ *Jon Leighton*
+
* The migration generator now creates a join table with (commented) indexes every time
the migration name contains the word `join_table`: