aboutsummaryrefslogtreecommitdiffstats
path: root/railties/CHANGELOG.md
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-11-14 11:28:12 +0000
committerJon Leighton <j@jonathanleighton.com>2011-11-14 11:28:12 +0000
commitda02f792fe78535628f86bf983308800207b4225 (patch)
tree7c61d8552502716585e44c7c69702bf6d3762761 /railties/CHANGELOG.md
parent2ec8d52b0cb830412e02b2504f9f2c3a12483b52 (diff)
downloadrails-da02f792fe78535628f86bf983308800207b4225.tar.gz
rails-da02f792fe78535628f86bf983308800207b4225.tar.bz2
rails-da02f792fe78535628f86bf983308800207b4225.zip
Sync CHANGELOGs from 3-1-stable
Diffstat (limited to 'railties/CHANGELOG.md')
-rw-r--r--railties/CHANGELOG.md10
1 files changed, 10 insertions, 0 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 0c59f59917..b05ac21b49 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -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) ##