From a302a333f8edc373e299da4c123bafadcc3a1306 Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Sun, 29 Aug 2010 22:47:18 +0200 Subject: revises a deprecation message --- activemodel/lib/active_model/errors.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activemodel') diff --git a/activemodel/lib/active_model/errors.rb b/activemodel/lib/active_model/errors.rb index 14312283d1..ed82c6ba7e 100644 --- a/activemodel/lib/active_model/errors.rb +++ b/activemodel/lib/active_model/errors.rb @@ -283,8 +283,8 @@ module ActiveModel if options[:default] ActiveSupport::Deprecation.warn \ - "ActiveModel::Errors#generate_message(attributes, custom_message) has been deprecated.\n" + - "Use ActiveModel::Errors#generate_message(attributes, :message => 'your message') instead." + "Giving :default as validation option to errors.add has been deprecated.\n" + + "Please use :message instead." options[:message] = options.delete(:default) end -- cgit v1.2.3 From b8619426916fdad32ab743f1c0b42dd19d4ebe71 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sun, 29 Aug 2010 22:06:48 -0700 Subject: Update CHANGELOGs for 3.0 release and upcoming 3.1 --- activemodel/CHANGELOG | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) (limited to 'activemodel') 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] -- cgit v1.2.3