aboutsummaryrefslogtreecommitdiffstats
path: root/railties/CHANGELOG
diff options
context:
space:
mode:
Diffstat (limited to 'railties/CHANGELOG')
-rw-r--r--railties/CHANGELOG2
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index d395067a5c..6efcb9f9db 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fix scaffold_resource generator so it respects the --pretend argument when creating the routes file. Closes #6852 [fearoffish]
+
* Fix Webrick Daemon dispatching bug regarding a bad current working directory. Closes #4899 [Rick Olson]
* Make config.plugins affect the load path and the dependencies system. Allows you to control plugin loading order, and keep disabled plugins off the load path. [James Adam]