diff options
author | Arthur Nogueira Neves <github@arthurnn.com> | 2015-03-19 09:19:22 -0400 |
---|---|---|
committer | Arthur Nogueira Neves <github@arthurnn.com> | 2015-03-19 09:19:22 -0400 |
commit | bee9434cdf4f56dc51027a8890cf04f506544735 (patch) | |
tree | 61973f614c9d2b9a097c395273b36a03e44e3144 /railties/lib | |
parent | dfdb08f0923d22b66d6a41e7935ca3a2e02dd15a (diff) | |
parent | 2f23f97b2e58ddb13af30d12c149e55d610a8a26 (diff) | |
download | rails-bee9434cdf4f56dc51027a8890cf04f506544735.tar.gz rails-bee9434cdf4f56dc51027a8890cf04f506544735.tar.bz2 rails-bee9434cdf4f56dc51027a8890cf04f506544735.zip |
Merge pull request #19387 from arthurnn/fix_route_regression
Add a new-line to the end of route method generated code.
Diffstat (limited to 'railties/lib')
-rw-r--r-- | railties/lib/rails/generators/actions.rb | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb index c1bc646c65..70a20801a0 100644 --- a/railties/lib/rails/generators/actions.rb +++ b/railties/lib/rails/generators/actions.rb @@ -221,7 +221,7 @@ module Rails sentinel = /\.routes\.draw do\s*\n/m in_root do - inject_into_file 'config/routes.rb', " #{routing_code}", { after: sentinel, verbose: false, force: true } + inject_into_file 'config/routes.rb', " #{routing_code}\n", { after: sentinel, verbose: false, force: true } end end diff --git a/railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb b/railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb index e4a2bc2b0f..c986f95e67 100644 --- a/railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb +++ b/railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb @@ -29,8 +29,10 @@ module Rails write("end", route_length - index) end - # route prepends two spaces onto the front of the string that is passed, this corrects that - route route_string[2..-1] + # route prepends two spaces onto the front of the string that is passed, this corrects that. + # Also it adds a \n to the end of each line, as route already adds that + # we need to correct that too. + route route_string[2..-2] end private |