diff options
| author | rick <technoweenie@gmail.com> | 2008-05-31 17:15:24 -0700 |
|---|---|---|
| committer | rick <technoweenie@gmail.com> | 2008-05-31 17:15:24 -0700 |
| commit | 6a975d6ca28216cfa015374c802279349e9253ca (patch) | |
| tree | e0a73c68e00755993f2bac86115f178656637c93 /activerecord/CHANGELOG | |
| parent | 72483c0d4c1e4ea794919974100acc2f255f6fd2 (diff) | |
| parent | ea03b0885c110003496c1f99dc7d9d2f1534955b (diff) | |
| download | rails-6a975d6ca28216cfa015374c802279349e9253ca.tar.gz rails-6a975d6ca28216cfa015374c802279349e9253ca.tar.bz2 rails-6a975d6ca28216cfa015374c802279349e9253ca.zip | |
fix changelog conflict
Diffstat (limited to 'activerecord/CHANGELOG')
| -rw-r--r-- | activerecord/CHANGELOG | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 31e1c22f0d..1c7c977141 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,8 +1,12 @@ +*2.1.0 (May 31st, 2008)* + * Add ActiveRecord::Base.sti_name that checks ActiveRecord::Base#store_full_sti_class? and returns either the full or demodulized name. [rick] * Add first/last methods to associations/named_scope. Resolved #226. [Ryan Bates] -*2.1.0 RC1 (May 11th, 2008)* +* Added SQL escaping for :limit and :offset #288 [Aaron Bedra, Steven Bristol, Jonathan Wiess] + +* Added first/last methods to associations/named_scope. Resolved #226. [Ryan Bates] * Ensure hm:t preloading honours reflection options. Resolves #137. [Frederick Cheung] |