Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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
@rafaelfranca rafaelfranca authored
View
2  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| -%>
View
2  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 %>

0 comments on commit ecd1722

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