From 152a393d4fc06fa3e7f6c8203fd937d671189be2 Mon Sep 17 00:00:00 2001
From: Paco Guzman <fjguzman@aspgems.com>
Date: Sun, 18 Dec 2011 22:42:36 +0100
Subject: Update changelogs with rails 3.0-stable branch info

---
 railties/CHANGELOG.md | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index a5f32d1a2c..f556ee210d 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -19,6 +19,15 @@
 
 *   Rails::Plugin has gone. Instead of adding plugins to vendor/plugins use gems or bundler with path or git dependencies. *Santiago Pastorino*
 
+
+## Rails 3.2.1 (January 26, 2012) ##
+
+*   Documentation fixes.
+
+*   Migration generation understands decimal{1.2} and decimal{1-2}, in
+    addition to decimal{1,2}. *José Valim*
+
+
 ## Rails 3.2.0 (January 20, 2012) ##
 
 *   Turn gem has been removed from default Gemfile. We still looking for a best presentation for tests output. *Guillermo Iguaran*
@@ -62,6 +71,22 @@
 *   Remove old 'config.paths.app.controller' API in favor of 'config.paths["app/controller"]' API *Guillermo Iguaran*
 
 
+## Rails 3.1.4 (unreleased) ##
+
+*   Setting config.force_ssl also marks the session cookie as secure.
+
+    *José Valim*
+
+*   Add therubyrhino to Gemfile in new applications when running under JRuby.
+
+    *Guillermo Iguaran*
+
+
+## Rails 3.1.3 (November 20, 2011) ##
+
+*   New apps should be generated with a sass-rails dependency of 3.1.5, not 3.1.5.rc.2
+
+
 ## Rails 3.1.2 (November 18, 2011) ##
 
 *   Engines: don't blow up if db/seeds.rb is missing.
@@ -178,12 +203,37 @@
 *   Include all helpers from plugins and shared engines in application *Piotr Sarnacki*
 
 
+## Rails 3.0.12 (unreleased) ##
+
+*   No changes.
+
+
+## Rails 3.0.11 (November 18, 2011) ##
+
+*   Updated Prototype UJS to lastest version fixing multiples errors in IE [Guillermo Iguaran]
+
+
+## Rails 3.0.10 (August 16, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.9 (June 16, 2011) ##
+
+*   No changes.
+
+
+## Rails 3.0.8 (June 7, 2011) ##
+
+*   Fix Rake 0.9.0 support.
+
+
 ## Rails 3.0.7 (April 18, 2011) ##
 
 *   No changes.
 
 
-*   Rails 3.0.6 (April 5, 2011)
+##   Rails 3.0.6 (April 5, 2011) ##
 
 *   No changes.
 
-- 
cgit v1.2.3