From 14b7452c578b8a1594daa8ae87fa26530601669c Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sat, 20 Mar 2010 13:33:25 -0500
Subject: Require info controller from info routes

---
 railties/lib/rails/info_controller.rb | 2 ++
 railties/lib/rails/info_routes.rb     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/railties/lib/rails/info_controller.rb b/railties/lib/rails/info_controller.rb
index 196eeb4a6c..18f13dc095 100644
--- a/railties/lib/rails/info_controller.rb
+++ b/railties/lib/rails/info_controller.rb
@@ -1,3 +1,5 @@
+require 'rails/info'
+
 class Rails::InfoController < ActionController::Base
   def properties
     if consider_all_requests_local? || local_request?
diff --git a/railties/lib/rails/info_routes.rb b/railties/lib/rails/info_routes.rb
index bd58034d8f..2e4157ea8d 100644
--- a/railties/lib/rails/info_routes.rb
+++ b/railties/lib/rails/info_routes.rb
@@ -1,3 +1,5 @@
+require 'rails/info_controller'
+
 Rails.application.routes.draw do |map|
   match '/rails/info/properties' => "rails/info#properties"
 end
-- 
cgit v1.2.3