aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAkira Matsuda <ronnie@dio.jp>2016-12-12 21:34:22 +0900
committerAkira Matsuda <ronnie@dio.jp>2016-12-12 21:34:22 +0900
commitedf4bff77cfc157afe7201a45c6b16652cdcceb8 (patch)
treed67963e0bd3dad07c5a2969af1f74568cc5b43ca
parentf1878baad5e8f6bc49d1c37dd5afb917b79985f4 (diff)
downloadrails-edf4bff77cfc157afe7201a45c6b16652cdcceb8.tar.gz
rails-edf4bff77cfc157afe7201a45c6b16652cdcceb8.tar.bz2
rails-edf4bff77cfc157afe7201a45c6b16652cdcceb8.zip
Oops!
namespace_ladder can be nil here
-rw-r--r--railties/lib/rails/generators/rails/controller/controller_generator.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/controller/controller_generator.rb b/railties/lib/rails/generators/rails/controller/controller_generator.rb
index 4f60e44888..01214dc919 100644
--- a/railties/lib/rails/generators/rails/controller/controller_generator.rb
+++ b/railties/lib/rails/generators/rails/controller/controller_generator.rb
@@ -54,7 +54,7 @@ module Rails
end.join
# Combine the 3 parts to generate complete route entry
- namespace_ladder + route + end_ladder
+ "#{namespace_ladder}#{route}#{end_ladder}"
end
end
end