aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2010-03-20 13:33:25 -0500
committerJoshua Peek <josh@joshpeek.com>2010-03-20 13:33:25 -0500
commit14b7452c578b8a1594daa8ae87fa26530601669c (patch)
tree3515f56b178e853748023aafd4f1f8b738fb0dd5 /railties
parentf38e89cfbad6886a2812b1176e0c47b7d95cda43 (diff)
downloadrails-14b7452c578b8a1594daa8ae87fa26530601669c.tar.gz
rails-14b7452c578b8a1594daa8ae87fa26530601669c.tar.bz2
rails-14b7452c578b8a1594daa8ae87fa26530601669c.zip
Require info controller from info routes
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/info_controller.rb2
-rw-r--r--railties/lib/rails/info_routes.rb2
2 files changed, 4 insertions, 0 deletions
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