From 5203b6dd50dd88904c57c001ed49c157b3afe536 Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Wed, 26 Dec 2012 15:16:09 +0100
Subject: backport #8616, quote column names in generated fixture files

Conflicts:

	railties/CHANGELOG.md
	railties/lib/rails/generators/test_unit/model/model_generator.rb
	railties/lib/rails/generators/test_unit/model/templates/fixtures.yml
	railties/test/generators/model_generator_test.rb
---
 railties/CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'railties/CHANGELOG.md')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 9110fdc673..0fed14c14e 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,5 +1,12 @@
 ## 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
 
-- 
cgit v1.2.3