aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-08-28 12:32:38 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2008-08-28 12:32:38 -0700
commit082c377954fda43ad3b84abe5864e3e181f8e757 (patch)
treef32e115e443869e3389b82091370ad8f6887de37 /activerecord
parent9cc8c0a0a18163fb6ae0f66b2513c902d19459dc (diff)
downloadrails-082c377954fda43ad3b84abe5864e3e181f8e757.tar.gz
rails-082c377954fda43ad3b84abe5864e3e181f8e757.tar.bz2
rails-082c377954fda43ad3b84abe5864e3e181f8e757.zip
Missed changelog update for #501
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG2
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 12295ac799..dcbe354733 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*Edge*
+* Merge scoped :joins together instead of overwriting them. May expose scoping bugs in your code! #501 [Andrew White]
+
* before_save, before_validation and before_destroy callbacks that return false will now ROLLBACK the transaction. Previously this would have been committed before the processing was aborted. #891 [Xavier Noria]
* Transactional migrations for databases which support them. #834 [divoxx, Adam Wiggins, Tarmo Tänav]