aboutsummaryrefslogtreecommitdiffstats
path: root/railties/CHANGELOG
diff options
context:
space:
mode:
Diffstat (limited to 'railties/CHANGELOG')
-rw-r--r--railties/CHANGELOG5
1 files changed, 5 insertions, 0 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index fc7a495853..fab2a5c383 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,10 @@
*SVN*
+* Added collision option to template generation in generators #3329 [anna@wota.jp]. Examples:
+
+ m.template "stuff.config" , "config/stuff.config" , :collision => :skip
+ m.template "auto-stamping", "config/generator.log", :collision => :force
+
* Added more information to script/plugin's doings to ease debugging #3755 [Rick Olson]
* Changed the default configuration for lighttpd to use tmp/sockets instead of log/ for the FastCGI sockets [DHH]