Permalink
Browse files

Sync CHANGELOGs from 3-1-stable

  • Loading branch information...
1 parent 2ec8d52 commit da02f792fe78535628f86bf983308800207b4225 @jonleighton jonleighton committed Nov 14, 2011
Showing with 42 additions and 0 deletions.
  1. +11 −0 actionpack/CHANGELOG.md
  2. +21 −0 activerecord/CHANGELOG.md
  3. +10 −0 railties/CHANGELOG.md
View
@@ -64,6 +64,15 @@
## Rails 3.1.2 (unreleased) ##
+* Ensure that the format isn't applied twice to the cache key, else it becomes impossible
+ to target with expire_action.
+
+ *Christopher Meiklejohn*
+
+* Swallow error when can't unmarshall object from session.
+
+ *Bruno Zanchet*
+
* Implement a workaround for a bug in ruby-1.9.3p0 where an error would be raised
while attempting to convert a template from one encoding to another.
@@ -76,6 +85,8 @@
*Jon Leighton*
+* Ensure users upgrading from 3.0.x to 3.1.x will properly upgrade their flash object in session (issues #3298 and #2509)
+
## Rails 3.1.1 (unreleased) ##
* javascript_path and stylesheet_path now refer to /assets if asset pipelining
View
@@ -67,6 +67,27 @@
## Rails 3.1.2 (unreleased) ##
+* Fix bug with PostgreSQLAdapter#indexes. When the search path has multiple schemas, spaces
+ were not being stripped from the schema names after the first.
+
+ *Sean Kirby*
+
+* Preserve SELECT columns on the COUNT for finder_sql when possible. *GH 3503*
+
+ *Justin Mazzi*
+
+* Reset prepared statement cache when schema changes impact statement results. *GH 3335*
+
+ *Aaron Patterson*
+
+* Postgres: Do not attempt to deallocate a statement if the connection is no longer active.
+
+ *Ian Leitch*
+
+* Prevent QueryCache leaking database connections. *GH 3243*
+
+ *Mark J. Titorenko*
+
* Fix bug where building the conditions of a nested through association could potentially
modify the conditions of the through and/or source association. If you have experienced
bugs with conditions appearing in the wrong queries when using nested through associations,
View
@@ -30,6 +30,16 @@
Plugins developers need to special case their initializers that are
meant to be run in the assets group by adding :group => :assets.
+## Rails 3.1.2 (unreleased) ##
+
+* Engines: don't blow up if db/seeds.rb is missing.
+
+ *Jeremy Kemper*
+
+* `rails new foo --skip-test-unit` should not add the `:test` task to the rake default task.
+ *GH 2564*
+
+ *José Valim*
## Rails 3.1.0 (August 30, 2011) ##

0 comments on commit da02f79

Please sign in to comment.