aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-04-30 17:24:06 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-04-30 17:24:06 -0700
commita9a4a5d41b263bc19346309a48d6610037ad7438 (patch)
tree43302a43b7f6d5ab97a3d9a01c5dc2b922bbc1c2
parent6330a18636c7c07a5d01f294e2fa48413ddcb042 (diff)
downloadrails-a9a4a5d41b263bc19346309a48d6610037ad7438.tar.gz
rails-a9a4a5d41b263bc19346309a48d6610037ad7438.tar.bz2
rails-a9a4a5d41b263bc19346309a48d6610037ad7438.zip
merging old history, adding release date
-rw-r--r--History.txt22
1 files changed, 20 insertions, 2 deletions
diff --git a/History.txt b/History.txt
index 6eec0b1d0d..22fa15eb7a 100644
--- a/History.txt
+++ b/History.txt
@@ -1,4 +1,4 @@
-== 2.1.0 (unreleased)
+== 2.1.0 / 2011/04/30
* Enhancements
@@ -52,7 +52,25 @@
* Arel::SelectManager#wheres is deprecated and will be removed in
3.0.0 with no replacement.
-== 2.0.7 (unreleased)
+== 2.0.9 / 2010/02/25
+
+* Bug Fixes
+
+ * Custom LOCK strings are allowed. Fixes LH # 6399
+ https://rails.lighthouseapp.com/projects/8994/tickets/6399-allow-database-specific-locking-clauses-to-be-used
+
+ * Strings passed to StringManager#on will be automatically tagged as SQL
+ literals. Fixes Rails LH #6384
+ https://rails.lighthouseapp.com/projects/8994/tickets/6384-activerecord-303-and-3-0-stable-generate-invalid-sql-for-has_many-through-association-with-conditions
+
+== 2.0.8 / 2010/02/08
+
+* Bug Fixes
+
+ * Added set operation support
+ * Fixed problems with *_any / *_all methods.
+
+== 2.0.7
* Bug Fixes