aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2010-10-18 12:24:41 -0200
committerSantiago Pastorino <santiago@wyeworks.com>2010-10-18 12:24:41 -0200
commit460c4efd711cc1fbcd87b4779fc682c149af36e9 (patch)
treefc190bca27e46aab92ea08fd00db4d0e79238c6f
parent31ac1db59600e00eeb098e29b43c073f239e2a1d (diff)
downloadrails-460c4efd711cc1fbcd87b4779fc682c149af36e9.tar.gz
rails-460c4efd711cc1fbcd87b4779fc682c149af36e9.tar.bz2
rails-460c4efd711cc1fbcd87b4779fc682c149af36e9.zip
Merge CHANGELOGs from 3-0-stable
-rw-r--r--actionmailer/CHANGELOG3
-rw-r--r--actionpack/CHANGELOG4
-rw-r--r--activemodel/CHANGELOG3
-rw-r--r--activerecord/CHANGELOG4
-rw-r--r--activeresource/CHANGELOG3
-rw-r--r--activesupport/CHANGELOG3
-rw-r--r--railties/CHANGELOG4
7 files changed, 24 insertions, 0 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG
index 62c1402346..9c073dce1f 100644
--- a/actionmailer/CHANGELOG
+++ b/actionmailer/CHANGELOG
@@ -2,6 +2,9 @@
* No changes
+*Rails 3.0.1 (October 15, 2010)*
+
+* No Changes, just a version bump.
*Rails 3.0.0 (August 29, 2010)*
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 3f8188b1f7..9eaa0eb605 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -16,6 +16,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.1 (October 15, 2010)*
+
+* No Changes, just a version bump.
+
*Rails 3.0.0 (August 29, 2010)*
* password_field renders with nil value by default making the use of passwords secure by default, if you want to render you should do for instance f.password_field(:password, :value => @user.password) [Santiago Pastorino]
diff --git a/activemodel/CHANGELOG b/activemodel/CHANGELOG
index 9c65778b59..e93d84ab59 100644
--- a/activemodel/CHANGELOG
+++ b/activemodel/CHANGELOG
@@ -2,6 +2,9 @@
* No changes
+*Rails 3.0.1 (October 15, 2010)*
+
+* No Changes, just a version bump.
*Rails 3.0.0 (August 29, 2010)*
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 8f283e1117..75657cb6ee 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -15,6 +15,10 @@
[Aaron Patterson]
+*Rails 3.0.1 (October 15, 2010)*
+
+* Introduce a fix for CVE-2010-3993
+
*Rails 3.0.0 (August 29, 2010)*
* Changed update_attribute to not run callbacks and update the record directly in the database [Neeraj Singh]
diff --git a/activeresource/CHANGELOG b/activeresource/CHANGELOG
index 37da2a711c..24fe3072e0 100644
--- a/activeresource/CHANGELOG
+++ b/activeresource/CHANGELOG
@@ -2,6 +2,9 @@
* No changes
+*Rails 3.0.1 (October 15, 2010)*
+
+* No Changes, just a version bump.
*Rails 3.0.0 (August 29, 2010)*
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index 4f970176e5..3b6a29f7d6 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -4,6 +4,9 @@
* 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.
*Rails 3.0.0 (August 29, 2010)*
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 5dd3a5108c..fdfdb5eef5 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -24,6 +24,10 @@
* Include all helpers from plugins and shared engines in application [Piotr Sarnacki]
+*Rails 3.0.1 (October 15, 2010)*
+
+* No Changes, just a version bump.
+
*Rails 3.0.0 (August 29, 2010)*
* Application generation: --skip-testunit and --skip-activerecord become --skip-test-unit and --skip-active-record respectively. [fxn]