Merge branch 'master' into cherry

Conflicts:
	activesupport/CHANGELOG
	activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
	activesupport/lib/active_support/core_ext/hash/conversions.rb
	activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
	activesupport/lib/active_support/core_ext/string/multibyte.rb
	activesupport/lib/active_support/core_ext/time/calculations.rb
	activesupport/lib/active_support/deprecation.rb

2 files changed, 11 insertions, 2 deletions

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
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