diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2014-02-28 19:26:04 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2014-02-28 19:26:04 -0500 |
| commit | b0767afac5390cb885c8274e78d5b7fa8bf7e157 (patch) | |
| tree | ffa5499360a50a50e69360820cf993cdc2f2855d /railties/lib/rails | |
| parent | a7b059ec7f25c16beeacf2c545d2be593ed0388b (diff) | |
| parent | fc61bca31d899f359671d4b58bceb8b9d6555aa7 (diff) | |
| download | rails-b0767afac5390cb885c8274e78d5b7fa8bf7e157.tar.gz rails-b0767afac5390cb885c8274e78d5b7fa8bf7e157.tar.bz2 rails-b0767afac5390cb885c8274e78d5b7fa8bf7e157.zip | |
Merge pull request #14195 from robin850/issue-14079
Avoid namespacing routes inside engines
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/rails/controller/controller_generator.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/controller/controller_generator.rb b/railties/lib/rails/generators/rails/controller/controller_generator.rb index 33a0d81bf6..7588a558e7 100644 --- a/railties/lib/rails/generators/rails/controller/controller_generator.rb +++ b/railties/lib/rails/generators/rails/controller/controller_generator.rb @@ -27,11 +27,11 @@ module Rails # end # end def generate_routing_code(action) - depth = class_path.length + depth = regular_class_path.length # Create 'namespace' ladder # namespace :foo do # namespace :bar do - namespace_ladder = class_path.each_with_index.map do |ns, i| + namespace_ladder = regular_class_path.each_with_index.map do |ns, i| indent("namespace :#{ns} do\n", i * 2) end.join |