Skip to content
This repository
Browse code

Merge pull request #6587 from amatsuda/controller_generator_remove_bl…

…ank_line_32

Backporting #6586 patch to 3-2-stable
  • Loading branch information...
commit ecd1722235d01f44f3fcef032145425cec92d9df 2 parents b57fa0b + 8984bc2
Rafael Mendonça França authored June 01, 2012
2  railties/lib/rails/generators/rails/controller/templates/controller.rb
... ...
@@ -1,7 +1,7 @@
1 1
 <% if namespaced? -%>
2 2
 require_dependency "<%= namespaced_file_path %>/application_controller"
3  
-<% end -%>
4 3
 
  4
+<% end -%>
5 5
 <% module_namespacing do -%>
6 6
 class <%= class_name %>Controller < ApplicationController
7 7
 <% actions.each do |action| -%>
2  railties/lib/rails/generators/rails/scaffold_controller/templates/controller.rb
... ...
@@ -1,7 +1,7 @@
1 1
 <% if namespaced? -%>
2 2
 require_dependency "<%= namespaced_file_path %>/application_controller"
3  
-<% end -%>
4 3
 
  4
+<% end -%>
5 5
 <% module_namespacing do -%>
6 6
 class <%= controller_class_name %>Controller < ApplicationController
7 7
   # GET <%= route_url %>

0 notes on commit ecd1722

Please sign in to comment.
Something went wrong with that request. Please try again.