Merge branch 'master' of git://github.com/rails/rails

Author: methodmissing

actionpack/test/fixtures/test/backup_files/item.html.erb

@@ -0,0 +1 @@
+The correct item.erb was loaded.

actionpack/test/fixtures/test/backup_files/item.html.erb.orig

@@ -0,0 +1 @@
+This is  an editor backup file and should never be loaded!

actionpack/test/template/render_test.rb

@@ -255,6 +255,12 @@ def test_render_utf8_template
       assert_equal Encoding::UTF_8, result.encoding
     end
   end
+
+  def test_render_with_backup_files
+    result = @view.render :file => "/test/backup_files/item"
+    assert_equal "The correct item.erb was loaded.\n", result
+  end
+
 end
 
 module TemplatesSetupTeardown

actionpack/test/template/template_test.rb

@@ -19,6 +19,8 @@ def test_template_path_parsing
       t.assert_parses_template_path 'abc',                    :extension => nil, :format => nil, :name => nil
       t.assert_parses_template_path 'abc.xxx',                :extension => nil, :format => 'xxx', :name => 'abc'
       t.assert_parses_template_path 'abc.html.xxx',           :extension => nil, :format => 'xxx', :name => 'abc'
+
+      t.assert_parses_template_path 'abc.html.erb.orig',      :format => 'orig', :extension => nil
     end
   end
 

activesupport/lib/active_support/cache/strategy/local_cache.rb

@@ -27,6 +27,11 @@ def call(env)
                 Thread.current[:#{thread_local_key}] = nil
               end
             EOS
+
+            def klass.to_s
+              "ActiveSupport::Cache::Strategy::LocalCache"
+            end
+
             klass
           end
         end

railties/builtin/rails_info/rails/info.rb

@@ -56,7 +56,12 @@ def to_html
         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 @@ def git_info
       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

railties/html/index.html

@@ -99,7 +99,12 @@
       }
       #about-content td.name  {color: #555}
       #about-content td.value {color: #000}
-      
+
+      #about-content ul {
+        padding: 0;
+        list-style-type: none;
+      }
+
       #about-content.failure {
         background-color: #fcc;
         border: 1px solid #f00;