From b42195cdb7c150626af1fe9cb720be14df5638ac Mon Sep 17 00:00:00 2001 From: Nicholas Seckar Date: Sun, 19 Mar 2006 18:21:06 +0000 Subject: Fix RailsInfoController. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3980 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/CHANGELOG | 2 ++ railties/builtin/controllers/rails_info_controller.rb | 5 ++++- railties/lib/rails_info.rb | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 77f345413a..6009c6b584 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fix the rails_info controller by explicitly loading it, and marking it as not reloadable. [Nicholas Seckar] + * Fixed rails:freeze:gems for Windows #3274 [paul@paulbutcher.com] * Added 'port open?' check to the spawner when running in repeat mode so we don't needlessly boot the dispatcher if the port is already in use anyway #4089 [guy.naor@famundo.com] diff --git a/railties/builtin/controllers/rails_info_controller.rb b/railties/builtin/controllers/rails_info_controller.rb index fe3c2d7c5d..ff943b130a 100644 --- a/railties/builtin/controllers/rails_info_controller.rb +++ b/railties/builtin/controllers/rails_info_controller.rb @@ -1,4 +1,7 @@ -class RailsInfoController < ApplicationController +class RailsInfoController < ActionController::Base + + def self.reloadable?() false end + def properties if local_request? render :inline => Rails::Info.to_html diff --git a/railties/lib/rails_info.rb b/railties/lib/rails_info.rb index 9ded9e0649..86c3fec841 100644 --- a/railties/lib/rails_info.rb +++ b/railties/lib/rails_info.rb @@ -1,4 +1,5 @@ require 'rails_version' +require File.join(File.dirname(File.dirname(__FILE__)), 'builtin/controllers/rails_info_controller') module Rails module Info -- cgit v1.2.3