diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2012-08-01 19:11:46 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2012-08-01 19:13:55 +0100 |
| commit | 0c527026308627652c42ed8a6f26a21d3bbc7a5b (patch) | |
| tree | 8efafdf41c335dfe39a13dcea712711b71b47a44 /activerecord/CHANGELOG.md | |
| parent | 6764b7ba23ff42998f2b61ecc3435382bdbd1aeb (diff) | |
| download | rails-0c527026308627652c42ed8a6f26a21d3bbc7a5b.tar.gz rails-0c527026308627652c42ed8a6f26a21d3bbc7a5b.tar.bz2 rails-0c527026308627652c42ed8a6f26a21d3bbc7a5b.zip | |
Revert "Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql."
This reverts commit a79bfa92e7bdc31b346d13ee5447d3fdac382bfb.
Conflicts:
activerecord/CHANGELOG.md
We shouldn't introducing deprecations in point releases.
It will be deprecated in 4.0 instead.
Diffstat (limited to 'activerecord/CHANGELOG.md')
| -rw-r--r-- | activerecord/CHANGELOG.md | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 8da51a64c3..63baa7a389 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,5 +1,8 @@ ## Rails 3.2.8 ## +* Reverted the deprecation of `*_sql` association options. They will + be deprecated in 4.0 instead. + * Do not eager load AR session store. ActiveRecord::SessionStore depends on the abstract store in Action Pack. Eager loading this class would break client code that eager loads Active Record standalone. Fixes #7160 *Xavier Noria* * Do not set RAILS_ENV to "development" when using `db:test:prepare` and related rake tasks. |