From 112056333f6ad2492a37b7eb9d647ecd23980592 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sat, 14 Mar 2009 10:37:20 -0500
Subject: Add Rack version to Rails info

---
 railties/builtin/rails_info/rails/info.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'railties/builtin')

diff --git a/railties/builtin/rails_info/rails/info.rb b/railties/builtin/rails_info/rails/info.rb
index 7b6f09ac69..a20d9bfe62 100644
--- a/railties/builtin/rails_info/rails/info.rb
+++ b/railties/builtin/rails_info/rails/info.rb
@@ -85,6 +85,10 @@ module Rails
       Gem::RubyGemsVersion
     end
 
+    property 'Rack version' do
+      ::Rack.release
+    end
+
     # The Rails version.
     property 'Rails version' do
       Rails::VERSION::STRING
-- 
cgit v1.2.3


From cad3e8b261a8d9551bc19a57007acf574d957548 Mon Sep 17 00:00:00 2001
From: Michael Schuerig <michael@schuerig.de>
Date: Thu, 2 Apr 2009 11:54:52 -0500
Subject: Show installed middleware in builtin rails info
 (/rails/info/properties) [#2396 state:resolved]

Signed-off-by: Joshua Peek <josh@joshpeek.com>
---
 railties/builtin/rails_info/rails/info.rb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'railties/builtin')

diff --git a/railties/builtin/rails_info/rails/info.rb b/railties/builtin/rails_info/rails/info.rb
index a20d9bfe62..0dd1c090c1 100644
--- a/railties/builtin/rails_info/rails/info.rb
+++ b/railties/builtin/rails_info/rails/info.rb
@@ -56,7 +56,12 @@ module Rails
         returning table = '<table>' do
           properties.each do |(name, value)|
             table << %(<tr><td class="name">#{CGI.escapeHTML(name.to_s)}</td>)
-            table << %(<td class="value">#{CGI.escapeHTML(value.to_s)}</td></tr>)
+            formatted_value = if value.kind_of?(Array)
+                  "<ul>" + value.map { |v| "<li>#{CGI.escapeHTML(v.to_s)}</li>" }.join + "</ul>"
+                else
+                  CGI.escapeHTML(value.to_s)
+                end
+            table << %(<td class="value">#{formatted_value}</td></tr>)
           end
           table << '</table>'
         end
@@ -102,6 +107,10 @@ module Rails
       end
     end
 
+    property 'Middleware' do
+      ActionController::Dispatcher.middleware.active.map(&:inspect)
+    end
+
     # The Rails Git revision, if it's checked out into vendor/rails.
     property 'Edge Rails revision' do
       edge_rails_revision
-- 
cgit v1.2.3


From f209d3898fbd866e1405861319b85c97674a0508 Mon Sep 17 00:00:00 2001
From: Manfred Stienstra <manfred@fngtps.com>
Date: Tue, 7 Apr 2009 09:16:48 -0500
Subject: Improve tests and code for Rails::InfoController and Rails::Info
 [#2411 state:resolved]

- Refactor Rails::InfoController tests.
- Return forbidden status from the InfoController for remote requests instead of a 500.
- Add tests for displaying middleware in Rails::Info.

Signed-off-by: Joshua Peek <josh@joshpeek.com>
---
 railties/builtin/rails_info/rails/info_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'railties/builtin')

diff --git a/railties/builtin/rails_info/rails/info_controller.rb b/railties/builtin/rails_info/rails/info_controller.rb
index 05745d606d..47e87c5bf5 100644
--- a/railties/builtin/rails_info/rails/info_controller.rb
+++ b/railties/builtin/rails_info/rails/info_controller.rb
@@ -3,7 +3,7 @@ class Rails::InfoController < ActionController::Base
     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
+      render :text => '<p>For security purposes, this information is only available to local requests.</p>', :status => :forbidden
     end
   end
 end
-- 
cgit v1.2.3