aboutsummaryrefslogtreecommitdiffstats
path: root/railties/CHANGELOG.md
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-05-04 06:50:45 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-05-04 06:50:45 -0700
commit628d6f133146a034a555760008e9dfc96fb1ff88 (patch)
tree50cbc9785943bd3ff63f0219ae54c42ed9ce07d7 /railties/CHANGELOG.md
parent903a2c2d33c91edaae08a952d94b4ac35a7443da (diff)
parentf1805a697831b356a2a6877291628fea8e2216e6 (diff)
downloadrails-628d6f133146a034a555760008e9dfc96fb1ff88.tar.gz
rails-628d6f133146a034a555760008e9dfc96fb1ff88.tar.bz2
rails-628d6f133146a034a555760008e9dfc96fb1ff88.zip
Merge pull request #10448 from arunagw/bug-fix-scaffold-generator-master
Fixes Scaffold generator with --assets=false
Diffstat (limited to 'railties/CHANGELOG.md')
-rw-r--r--railties/CHANGELOG.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index e1b98eda55..58bd77836c 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Fixes bug with Scaffold generator with --assets=false --resource-route=false See #9525 for more details.
+
+ *Arun Agrawal*
+
* Rails::Railtie no longer forces the Rails::Configurable module on everything
that subclassess it. Instead, the methods from Rails::Configurable have been
moved to class methods in Railtie and the Railtie has been made abstract.