aboutsummaryrefslogtreecommitdiffstats
path: root/railties/CHANGELOG.md
diff options
context:
space:
mode:
authorAndrew White <andyw@pixeltrix.co.uk>2015-02-03 22:47:59 +0000
committerAndrew White <andyw@pixeltrix.co.uk>2015-02-03 22:53:23 +0000
commit1c59ffca5c8e998aa5cfc0abb594981de23e64c8 (patch)
treedb3386412e4ce4c6a917f64e01bc9f129c69a53a /railties/CHANGELOG.md
parent158c7eb1d61a28452e0aafd1e05314352eea2749 (diff)
downloadrails-1c59ffca5c8e998aa5cfc0abb594981de23e64c8.tar.gz
rails-1c59ffca5c8e998aa5cfc0abb594981de23e64c8.tar.bz2
rails-1c59ffca5c8e998aa5cfc0abb594981de23e64c8.zip
Don't remove all line endings from routes.rb
When there is a single scaffold in the routes.rb with no other lines then revoking/destroying it will create a routes.rb file with a syntax error. This is because the sentinel for the Thor `route` action didn't include the newline but the logged route code did. The fix is to add the newline to the sentinel and remove it from the the logged route code. Fixes #15913.
Diffstat (limited to 'railties/CHANGELOG.md')
-rw-r--r--railties/CHANGELOG.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 90aa831f74..a202325e88 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,9 @@
+* Don't remove all line endings from routes.rb when revoking scaffold.
+
+ Fixes #15913.
+
+ *Andrew White*
+
* Rename `--skip-test-unit` option to `--skip-test` in app generator
*Melanie Gilman*