aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-07-23 14:26:16 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-07-23 14:26:16 -0700
commit125dfdfcf7aa990d49817ef84202f6a374804882 (patch)
treedf070962c494ea0e834eafb103016487e4b4f062
parent6b7d26cf3c061907aedc44f7f36776c9b36950fd (diff)
downloadrails-125dfdfcf7aa990d49817ef84202f6a374804882.tar.gz
rails-125dfdfcf7aa990d49817ef84202f6a374804882.tar.bz2
rails-125dfdfcf7aa990d49817ef84202f6a374804882.zip
updating changelogs
-rw-r--r--RAILS_VERSION2
-rw-r--r--actionmailer/CHANGELOG.md4
-rw-r--r--actionpack/CHANGELOG.md16
-rw-r--r--activemodel/CHANGELOG.md6
-rw-r--r--activeresource/CHANGELOG.md4
-rw-r--r--activesupport/CHANGELOG.md8
-rw-r--r--railties/CHANGELOG.md5
7 files changed, 44 insertions, 1 deletions
diff --git a/RAILS_VERSION b/RAILS_VERSION
index 34cde5690e..742598a3ca 100644
--- a/RAILS_VERSION
+++ b/RAILS_VERSION
@@ -1 +1 @@
-3.2.6
+3.2.7.rc1
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index f19f281e71..89d5ebde01 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Rails 3.2.7 (unreleased)
+
+* No changes.
+
## Rails 3.2.6 (Jun 12, 2012)
* No changes.
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 4b483b200f..770576f826 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,19 @@
+## Rails 3.2.7 (unreleased) ##
+
+* Bump Journey requirements to 1.0.4
+
+* Add support for optional root segments containing slashes
+
+* Fixed bug creating invalid HTML in select options
+
+* Show in log correct wrapped keys
+
+* Fix NumberHelper options wrapping to prevent verbatim blocks being rendered instead of line continuations.
+
+* ActionController::Metal doesn't have logger method, check it and then delegate
+
+* ActionController::Caching depends on RackDelegation and AbstractController::Callbacks
+
## Rails 3.2.6 (Jun 12, 2012) ##
* nil is removed from array parameter values
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
index 1ea6784042..8d650500ef 100644
--- a/activemodel/CHANGELOG.md
+++ b/activemodel/CHANGELOG.md
@@ -1,3 +1,9 @@
+## Rails 3.2.7 (unreleased)
+
+* `validates_inclusion_of` and `validates_exclusion_of` now accept `:within` option as alias of `:in` as documented.
+
+* Fix the the backport of the object dup with the ruby 1.9.3p194.
+
## Rails 3.2.6 (Jun 12, 2012)
* No changes.
diff --git a/activeresource/CHANGELOG.md b/activeresource/CHANGELOG.md
index 37dcece116..eb0a073018 100644
--- a/activeresource/CHANGELOG.md
+++ b/activeresource/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Rails 3.2.7 (unreleased)
+
+* No changes.
+
## Rails 3.2.6 (Jun 12, 2012)
* No changes.
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index d20e011f0a..4c5eaecdea 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,11 @@
+## Rails 3.2.7 (unreleased)
+
+* Hash#fetch(fetch) is not the same as doing hash[key]
+* adds a missing require [fixes #6896]
+* make sure the inflection rules are loaded when cherry-picking active_support/core_ext/string/inflections.rb [fixes #6884]
+* Merge pull request #6857 from rsutphin/as_core_ext_time_missing_require
+* bump AS deprecation_horizon to 4.0
+
## Rails 3.2.6 (Jun 12, 2012)
* No changes.
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 1fbfd092e1..2205bb6334 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 3.2.7 (unreleased)
+
+* Since Rails 3.2, use layout false to render no layout
+* Use strict_args_position! if available from Thor
+
## Rails 3.2.6 (Jun 12, 2012)
* No changes.