aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/welcome_controller.rb
diff options
context:
space:
mode:
Diffstat (limited to 'railties/lib/rails/welcome_controller.rb')
-rw-r--r--railties/lib/rails/welcome_controller.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/railties/lib/rails/welcome_controller.rb b/railties/lib/rails/welcome_controller.rb
index 45b764fa6b..de9cd18b01 100644
--- a/railties/lib/rails/welcome_controller.rb
+++ b/railties/lib/rails/welcome_controller.rb
@@ -1,6 +1,7 @@
-class Rails::WelcomeController < ActionController::Base # :nodoc:
- self.view_paths = File.expand_path('../templates', __FILE__)
- layout nil
+require 'rails/application_controller'
+
+class Rails::WelcomeController < Rails::ApplicationController # :nodoc:
+ layout false
def index
end