diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-01-02 13:23:20 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-01-02 13:23:20 -0800 |
| commit | e5ee5a9d24f897bb8999bc6d3f47edc54917db99 (patch) | |
| tree | 707c21d3cce9e0a6250ab8d00bf39428942e841d /railties/CHANGELOG.md | |
| parent | 2aa70bd61a5c4a55dffa79fb6da9b8c8d6dd8b69 (diff) | |
| parent | 204109eac9708d615bd88d60b0b7e5d265941423 (diff) | |
| download | rails-e5ee5a9d24f897bb8999bc6d3f47edc54917db99.tar.gz rails-e5ee5a9d24f897bb8999bc6d3f47edc54917db99.tar.bz2 rails-e5ee5a9d24f897bb8999bc6d3f47edc54917db99.zip | |
Merge branch '3-2-stable' into 3-2-secmerge
* 3-2-stable:
fix block.arity raise nil error when not given a block to "content_tag_for"
removes the Ajax on Rails early draft
Revert "Merge pull request #8665 from senny/8661_should_not_append_charset_if_already_present"
backport #8662, charset should not be appended for `head` responses
Revert "Fix `validates_presence_of` with `:allow_nil` or `:allow_blank` options."
Fix `validates_presence_of` with `:allow_nil` or `:allow_blank` options.
backport #8616, quote column names in generated fixture files
Diffstat (limited to 'railties/CHANGELOG.md')
| -rw-r--r-- | railties/CHANGELOG.md | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 33ba020e0a..b4fe104fb8 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -4,6 +4,13 @@ ## Rails 3.2.9 (Nov 12, 2012) ## +* Quote column names in generates fixture files. This prevents + conflicts with reserved YAML keywords such as 'yes' and 'no' + Fix #8612. + Backport #8616. + + *Yves Senn* + * Engines with a dummy app include the rake tasks of dependencies in the app namespace. [Backport: #8262] Fix #8229 |