aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionmailer/CHANGELOG.md3
-rw-r--r--actionpack/CHANGELOG.md3
-rw-r--r--activemodel/CHANGELOG.md3
-rw-r--r--activerecord/CHANGELOG.md17
-rw-r--r--activesupport/CHANGELOG.md3
-rw-r--r--guides/CHANGELOG.md3
-rw-r--r--railties/CHANGELOG.md3
7 files changed, 30 insertions, 5 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 3907e93097..8f74ac0928 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,3 +1,6 @@
+## Rails 4.0.0 (unreleased) ##
+
+
## Rails 4.0.0.beta1 (February 25, 2013) ##
* Allow passing interpolations to `#default_i18n_subject`, e.g.:
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 5197d944b1..8ae23598b4 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,6 @@
+## Rails 4.0.0 (unreleased) ##
+
+
## Rails 4.0.0.beta1 (February 25, 2013) ##
* Fix `respond_to` not using formats that have no block if all is present. *Michael Grosser*
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
index 227374b331..1fe6dbd4d9 100644
--- a/activemodel/CHANGELOG.md
+++ b/activemodel/CHANGELOG.md
@@ -1,3 +1,6 @@
+## Rails 4.0.0 (unreleased) ##
+
+
## Rails 4.0.0.beta1 (February 25, 2013) ##
* Add `ActiveModel::Validations::AbsenceValidator`, a validator to check the
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 3fbf043c7c..982fbdc236 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,8 +1,4 @@
-## Rails 4.0.0.beta1 (February 25, 2013) ##
-
-* Fix overriding of attributes by default_scope on `ActiveRecord::Base#dup`.
-
- *Hiroshige UMINO*
+## Rails 4.0.0 (unreleased) ##
* Fix when performing an ordered join query. The bug only
affected queries where the order was given with a symbol.
@@ -13,6 +9,17 @@
# This will expand the order :name to "authors".name.
Author.joins(:books).where('books.published = 1').order(:name)
+
+## Rails 4.0.0.beta1 (February 25, 2013) ##
+
+* Fix overriding of attributes by default_scope on `ActiveRecord::Base#dup`.
+
+ *Hiroshige UMINO*
+
+* Update queries now use prepared statements.
+
+ *Olli Rissanen*
+
* Fixing issue #8345. Now throwing an error when one attempts to touch a
new object that has not yet been persisted. For instance:
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 97b3344db0..e76af6adc4 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,6 @@
+## Rails 4.0.0 (unreleased) ##
+
+
## Rails 4.0.0.beta1 (February 25, 2013) ##
* Prevent `DateTime#change` from truncating the second fraction, when seconds
diff --git a/guides/CHANGELOG.md b/guides/CHANGELOG.md
index a9595d1f15..ee6e64b731 100644
--- a/guides/CHANGELOG.md
+++ b/guides/CHANGELOG.md
@@ -1,3 +1,6 @@
+## Rails 4.0.0 (unreleased) ##
+
+
## Rails 4.0.0.beta1 (unreleased) ##
* Split Validations and Callbacks guide into two. *Steve Klabnik*
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 5efdbfecc6..f3c07470af 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,6 @@
+## Rails 4.0.0 (unreleased) ##
+
+
## Rails 4.0.0.beta1 (February 25, 2013) ##
* Improve `rake stats` for JavaScript and CoffeeScript: ignore block comments