Skip to content
Browse files

syncs CHANGELOGs for 3.0.2 in 3-0-stable with the ones in master

  • Loading branch information...
1 parent 88a559d commit 41366cdec6003011e19971c1bcfb82949ff93a6e @fxn fxn committed Nov 9, 2010
Showing with 49 additions and 2 deletions.
  1. +4 −0 actionmailer/CHANGELOG
  2. +4 −2 actionpack/CHANGELOG
  3. +4 −0 activemodel/CHANGELOG
  4. +29 −0 activerecord/CHANGELOG
  5. +4 −0 activeresource/CHANGELOG
  6. +4 −0 activesupport/CHANGELOG
View
4 actionmailer/CHANGELOG
@@ -2,6 +2,10 @@
* No changes
+*Rails 3.0.2 (unreleased)*
+
+* No changes
+
*Rails 3.0.1 (October 15, 2010)*
* No Changes, just a version bump.
View
6 actionpack/CHANGELOG
@@ -1,7 +1,5 @@
*Rails 3.1.0 (unreleased)*
-* The helper number_to_currency accepts a new :negative_format option to be able to configure how to render negative amounts. [Don Wilson]
-
* Added a convenience idiom to generate HTML5 data-* attributes in tag helpers from a :data hash of options:
tag("div", :data => {:name => 'Stephen', :city_state => %w(Chicago IL)})
@@ -25,6 +23,10 @@
* Add Rack::Cache to the default stack. Create a Rails store that delegates to the Rails cache, so by default, whatever caching layer you are using will be used for HTTP caching. Note that Rack::Cache will be used if you use #expires_in, #fresh_when or #stale with :public => true. Otherwise, the caching rules will apply to the browser only. [Yehuda Katz, Carl Lerche]
+*Rails 3.0.2 (unreleased)*
+
+* The helper number_to_currency accepts a new :negative_format option to be able to configure how to render negative amounts. [Don Wilson]
+
*Rails 3.0.1 (October 15, 2010)*
* No Changes, just a version bump.
View
4 activemodel/CHANGELOG
@@ -2,6 +2,10 @@
* No changes
+*Rails 3.0.2 (unreleased)*
+
+* No changes
+
*Rails 3.0.1 (October 15, 2010)*
* No Changes, just a version bump.
View
29 activerecord/CHANGELOG
@@ -18,6 +18,35 @@
[Aaron Patterson]
+*Rails 3.0.2 (unreleased)*
+
+* reorder is deprecated in favor of except(:order).order(...) [Santiago Pastorino]
+
+* except is now AR public API
+
+ Model.order('name').except(:order).order('salary')
+
+ generates:
+
+ SELECT * FROM models ORDER BY salary
+
+ [Santiago Pastorino]
+
+* The following code:
+
+ Model.limit(10).scoping { Model.count }
+
+ now generates the following SQL:
+
+ SELECT COUNT(*) FROM models LIMIT 10
+
+ This may not return what you want. Instead, you may with to do something
+ like this:
+
+ Model.limit(10).scoping { Model.all.size }
+
+ [Aaron Patterson]
+
*Rails 3.0.1 (October 15, 2010)*
* Introduce a fix for CVE-2010-3993
View
4 activeresource/CHANGELOG
@@ -2,6 +2,10 @@
* No changes
+*Rails 3.0.2 (unreleased)*
+
+* No changes
+
*Rails 3.0.1 (October 15, 2010)*
* No Changes, just a version bump.
View
4 activesupport/CHANGELOG
@@ -4,6 +4,10 @@
* Added before_remove_const callback to ActiveSupport::Dependencies.remove_unloadable_constants! [Andrew White]
+*Rails 3.0.2 (unreleased)*
+
+* Added before_remove_const callback to ActiveSupport::Dependencies.remove_unloadable_constants! [Andrew White]
+
*Rails 3.0.1 (October 15, 2010)*
* No Changes, just a version bump.

0 comments on commit 41366cd

Please sign in to comment.
Something went wrong with that request. Please try again.