aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2008-06-02 21:55:42 -0500
committerDavid Heinemeier Hansson <david@loudthinking.com>2008-06-02 21:55:42 -0500
commit442d2f1032df6744c11f21b5ec6281c77e39c242 (patch)
tree68cab5238c5247827d3f230ea9f6f5d8d85208f8 /railties
parent92050f6c6f586b2a73aeb61da4f41b9822bbcf6d (diff)
downloadrails-442d2f1032df6744c11f21b5ec6281c77e39c242.tar.gz
rails-442d2f1032df6744c11f21b5ec6281c77e39c242.tar.bz2
rails-442d2f1032df6744c11f21b5ec6281c77e39c242.zip
Fixed that RailsInfoController wasnt considering all requests local in development mode (Edgard Castro) [#310 state:resolved]
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG5
-rw-r--r--railties/builtin/rails_info/rails/info_controller.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index fe517755ef..4d1c86e643 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,3 +1,8 @@
+*Edge*
+
+* Fixed that RailsInfoController wasn't considering all requests local in development mode (Edgard Castro) [#310 state:resolved]
+
+
*2.1.0 (May 31st, 2008)*
* script/dbconsole fires up the command-line database client. #102 [Steve Purcell]
diff --git a/railties/builtin/rails_info/rails/info_controller.rb b/railties/builtin/rails_info/rails/info_controller.rb
index 39f8b1f120..05745d606d 100644
--- a/railties/builtin/rails_info/rails/info_controller.rb
+++ b/railties/builtin/rails_info/rails/info_controller.rb
@@ -1,6 +1,6 @@
class Rails::InfoController < ActionController::Base
def properties
- if local_request?
+ if consider_all_requests_local || local_request?
render :inline => Rails::Info.to_html
else
render :text => '<p>For security purposes, this information is only available to local requests.</p>', :status => 500