diff options
| author | Nicholas Seckar <nseckar@gmail.com> | 2006-03-19 18:21:06 +0000 |
|---|---|---|
| committer | Nicholas Seckar <nseckar@gmail.com> | 2006-03-19 18:21:06 +0000 |
| commit | b42195cdb7c150626af1fe9cb720be14df5638ac (patch) | |
| tree | 03c91f2d6c1cebeeef8eef475c1ad441303d0627 | |
| parent | 753010ac39f5442c92ec0bdd7484f0fd72ad8ac0 (diff) | |
| download | rails-b42195cdb7c150626af1fe9cb720be14df5638ac.tar.gz rails-b42195cdb7c150626af1fe9cb720be14df5638ac.tar.bz2 rails-b42195cdb7c150626af1fe9cb720be14df5638ac.zip | |
Fix RailsInfoController.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3980 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/builtin/controllers/rails_info_controller.rb | 5 | ||||
| -rw-r--r-- | railties/lib/rails_info.rb | 1 |
3 files changed, 7 insertions, 1 deletions
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 |