diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-06-01 06:57:25 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-06-01 06:57:25 -0700 |
| commit | 7013f73c3b98471eeff436524775f919523f5257 (patch) | |
| tree | 70a9eacb428cf16d577dbb5f242a219693853782 | |
| parent | 070454c6f777abb8c70970bfb07975cedc340f00 (diff) | |
| parent | ec106e9d439a9ec48dc9268d8eca0f3595aa7cb9 (diff) | |
| download | rails-7013f73c3b98471eeff436524775f919523f5257.tar.gz rails-7013f73c3b98471eeff436524775f919523f5257.tar.bz2 rails-7013f73c3b98471eeff436524775f919523f5257.zip | |
Merge pull request #6586 from amatsuda/generator_blank_line
remove unneeded blank line from !namespeced? generated controllers
| -rw-r--r-- | railties/lib/rails/generators/rails/controller/templates/controller.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/controller/templates/controller.rb b/railties/lib/rails/generators/rails/controller/templates/controller.rb index ece6bbba3b..4053113b4b 100644 --- a/railties/lib/rails/generators/rails/controller/templates/controller.rb +++ b/railties/lib/rails/generators/rails/controller/templates/controller.rb @@ -1,7 +1,7 @@ <% if namespaced? -%> require_dependency "<%= namespaced_file_path %>/application_controller" -<% end -%> +<% end -%> <% module_namespacing do -%> class <%= class_name %>Controller < ApplicationController <% actions.each do |action| -%> diff --git a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb index 0294bde582..b3e74f9b02 100644 --- a/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb +++ b/railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb @@ -1,7 +1,7 @@ <% if namespaced? -%> require_dependency "<%= namespaced_file_path %>/application_controller" -<% end -%> +<% end -%> <% module_namespacing do -%> class <%= controller_class_name %>Controller < ApplicationController # GET <%= route_url %> |