Add an application controller for internal controllers

railties/lib/rails/application_controller.rb

@@ -0,0 +1,16 @@
+class Rails::ApplicationController < ActionController::Base # :nodoc:
+  self.view_paths = File.expand_path('../templates', __FILE__)
+  layout 'application'
+
+  protected
+
+  def require_local!
+    unless local_request?
+      render text: '<p>For security purposes, this information is only available to local requests.</p>', status: :forbidden
+    end
+  end
+
+  def local_request?
+    Rails.application.config.consider_all_requests_local || request.local?
+  end
+end

railties/lib/rails/info_controller.rb

@@ -1,9 +1,9 @@
+require 'rails/application_controller'
 require 'action_dispatch/routing/inspector'
 
-class Rails::InfoController < ActionController::Base # :nodoc:
+class Rails::InfoController < Rails::ApplicationController # :nodoc:
-  self.view_paths = File.expand_path('../templates', __FILE__)
   prepend_view_path ActionDispatch::DebugExceptions::RESCUES_TEMPLATE_PATH
-  layout -> { request.xhr? ? nil : 'application' }
+  layout -> { request.xhr? ? false : 'application' }
 
   before_filter :require_local!
 
@@ -20,16 +20,4 @@ class Rails::InfoController < ActionController::Base # :nodoc:
     @routes_inspector = ActionDispatch::Routing::RoutesInspector.new(_routes.routes)
     @page_title = 'Routes'
   end
-
-  protected
-
-  def require_local!
-    unless local_request?
-      render text: '<p>For security purposes, this information is only available to local requests.</p>', status: :forbidden
-    end
-  end
-
-  def local_request?
-    Rails.application.config.consider_all_requests_local || request.local?
-  end
 end

railties/lib/rails/welcome_controller.rb

@@ -1,6 +1,7 @@
-class Rails::WelcomeController < ActionController::Base # :nodoc:
+require 'rails/application_controller'
-  self.view_paths = File.expand_path('../templates', __FILE__)
+
-  layout nil
+class Rails::WelcomeController < Rails::ApplicationController # :nodoc:
+  layout false
 
   def index
   end