diff options
| author | José Valim <jose.valim@gmail.com> | 2010-08-30 15:55:07 -0300 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-08-30 15:55:10 -0300 |
| commit | d37a65307d280e47eb5c15b61c0b20ac6cab6a84 (patch) | |
| tree | 39f6e9036ab11b5059f34e72e65dfeca84bcbbff /activemodel | |
| parent | 3c8e1f99b9613cca4813e2a1b062d58ec4b2627b (diff) | |
| parent | b422cda2ebfff4032f4c18271e96ad329c413dcc (diff) | |
| download | rails-d37a65307d280e47eb5c15b61c0b20ac6cab6a84.tar.gz rails-d37a65307d280e47eb5c15b61c0b20ac6cab6a84.tar.bz2 rails-d37a65307d280e47eb5c15b61c0b20ac6cab6a84.zip | |
Merge josevalim/deprecations branch.
I maintained on purpose the DeprecatedUrlOptions in ActionMailer and the Deprecated configuration in Railties because they were already addressed by Piotr in his RSoC work.
Diffstat (limited to 'activemodel')
| -rw-r--r-- | activemodel/CHANGELOG | 32 |
1 files changed, 6 insertions, 26 deletions
diff --git a/activemodel/CHANGELOG b/activemodel/CHANGELOG index 20eb1c9ad2..9c65778b59 100644 --- a/activemodel/CHANGELOG +++ b/activemodel/CHANGELOG @@ -1,30 +1,14 @@ -*Rails 3.0.0 (unreleased)* +*Rails 3.1.0 (unreleased)* * No changes -*Rails 3.0.0 [release candidate 2] (August 23rd, 2010)* - -* No changes - - -*Rails 3.0.0 [release candidate] (July 26th, 2010)* +*Rails 3.0.0 (August 29, 2010)* * Added ActiveModel::MassAssignmentSecurity [Eric Chapweske, Josh Kalderimis] - -*Rails 3.0.0 [beta 4] (June 8th, 2010)* - * JSON supports a custom root option: to_json(:root => 'custom') #4515 [Jatinder Singh] - -*Rails 3.0.0 [beta 3] (April 13th, 2010)* - -* No changes - - -*Rails 3.0.0 [beta 2] (April 1st, 2010)* - * #new_record? and #destroyed? were removed from ActiveModel::Lint. Use persisted? instead. A model is persisted if it's not a new_record? and it was not destroyed? [MG] @@ -37,19 +21,15 @@ * #to_key was added to ActiveModel::Lint so we can generate DOM IDs for AMo objects with composite keys [MG] - -*Rails 3.0.0 [beta 1] (February 4, 2010)* - * ActiveModel::Observer#add_observer! It has a custom hook to define after_find that should really be in a ActiveRecord::Observer subclass: - def add_observer!(klass) - klass.add_observer(self) - klass.class_eval 'def after_find() end' unless - klass.respond_to?(:after_find) - end + def add_observer!(klass) + klass.add_observer(self) + klass.class_eval 'def after_find() end' unless klass.respond_to?(:after_find) + end * Change the ActiveModel::Base.include_root_in_json default to true for Rails 3 [DHH] |