diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-06-01 07:20:31 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-06-01 07:20:31 -0700 |
| commit | ecd1722235d01f44f3fcef032145425cec92d9df (patch) | |
| tree | e8d24408849907100ba645ec206e9551f7890272 | |
| parent | b57fa0bf690b299ba4d8a0051bf06b9cecd3975a (diff) | |
| parent | 8984bc2b7b11f52a04318c06b7c26000f82dd38c (diff) | |
| download | rails-ecd1722235d01f44f3fcef032145425cec92d9df.tar.gz rails-ecd1722235d01f44f3fcef032145425cec92d9df.tar.bz2 rails-ecd1722235d01f44f3fcef032145425cec92d9df.zip | |
Merge pull request #6587 from amatsuda/controller_generator_remove_blank_line_32
Backporting #6586 patch to 3-2-stable
| -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 593c8d85e6..6e4ad38c16 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 %> |