aboutsummaryrefslogtreecommitdiffstats
path: root/railties/generators
diff options
context:
space:
mode:
Diffstat (limited to 'railties/generators')
-rw-r--r--railties/generators/controller/templates/controller.rb2
-rw-r--r--railties/generators/scaffold/templates/controller.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/generators/controller/templates/controller.rb b/railties/generators/controller/templates/controller.rb
index f9800ab556..da71b5f057 100644
--- a/railties/generators/controller/templates/controller.rb
+++ b/railties/generators/controller/templates/controller.rb
@@ -1,4 +1,4 @@
-class <%= class_name %>Controller < AbstractApplicationController
+class <%= class_name %>Controller < ApplicationController
<% if options[:scaffold] -%>
scaffold :<%= singular_name %>
<% end -%>
diff --git a/railties/generators/scaffold/templates/controller.rb b/railties/generators/scaffold/templates/controller.rb
index c8706098da..83520f4794 100644
--- a/railties/generators/scaffold/templates/controller.rb
+++ b/railties/generators/scaffold/templates/controller.rb
@@ -1,4 +1,4 @@
-class <%= class_name %>Controller < AbstractApplicationController
+class <%= class_name %>Controller < ApplicationController
model :<%= singular_name %>
layout 'scaffold'