1 files changed, 51 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index e536d2b408..a03751a6c1 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,56 @@
 *Rails 3.1.0 (unreleased)*
 
+* AR#new, AR#create and AR#update_attributes all accept a second hash as option that allows you
+  to specify which role to consider when assigning attributes. This is built on top of ActiveModel's
+  new mass assignment capabilities:
+
+    class Post < ActiveRecord::Base
+      attr_accessible :title
+      attr_accessible :title, :published_at, :as => :admin
+    end
+
+    Post.new(params[:post], :as => :admin)
+
+  assign_attributes() with similar API was also added and attributes=(params, guard) was deprecated.
+  
+  [Josh Kalderimis]
+
+* default_scope can take a block, lambda, or any other object which responds to `call` for lazy
+  evaluation:
+
+    default_scope { ... }
+    default_scope lambda { ... }
+    default_scope method(:foo)
+
+  This feature was originally implemented by Tim Morgan, but was then removed in favour of
+  defining a 'default_scope' class method, but has now been added back in by Jon Leighton.
+  The relevant lighthouse ticket is #1812.
+
+* Default scopes are now evaluated at the latest possible moment, to avoid problems where
+  scopes would be created which would implicitly contain the default scope, which would then
+  be impossible to get rid of via Model.unscoped.
+
+  Note that this means that if you are inspecting the internal structure of an
+  ActiveRecord::Relation, it will *not* contain the default scope, though the resulting
+  query will do. You can get a relation containing the default scope by calling
+  ActiveRecord#with_default_scope, though this is not part of the public API.
+
+  [Jon Leighton]
+
+* If you wish to merge default scopes in special ways, it is recommended to define your default
+  scope as a class method and use the standard techniques for sharing code (inheritance, mixins,
+  etc.):
+
+    class Post < ActiveRecord::Base
+      def self.default_scope
+        where(:published => true).where(:hidden => false)
+      end
+    end
+
+  [Jon Leighton]
+
+* PostgreSQL adapter only supports PostgreSQL version 8.2 and higher.
+
 * ConnectionManagement middleware is changed to clean up the connection pool
   after the rack body has been flushed.