Merge commit 'rails/master'

4 files changed, 12 insertions, 2 deletions

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 44635ff4f6..5c7de616be 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -132,7 +132,7 @@ module Rails
           middleware.use('::Rack::Lock', :if => lambda { !allow_concurrency })
           middleware.use('::Rack::Runtime')
           middleware.use('::Rails::Rack::Logger')
-          middleware.use('::ActionDispatch::ShowExceptions', lambda { consider_all_requests_local })
+          middleware.use('::ActionDispatch::ShowExceptions', lambda { consider_all_requests_local }, :if => lambda { action_dispatch.show_exceptions })
           middleware.use("::ActionDispatch::RemoteIp", lambda { action_dispatch.ip_spoofing_check }, lambda { action_dispatch.trusted_proxies })
           middleware.use('::Rack::Sendfile', lambda { action_dispatch.x_sendfile_header })
           middleware.use('::ActionDispatch::Callbacks', lambda { !cache_classes })
diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
index 0b87b241ec..beb28e2229 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
@@ -14,6 +14,9 @@
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
+  # Raise exceptions instead of rendering exception templates
+  config.action_dispatch.show_exceptions = false
+
   # Disable request forgery protection in test environment
   config.action_controller.allow_forgery_protection    = false
 
diff --git a/railties/lib/rails/generators/rails/app/templates/public/index.html b/railties/lib/rails/generators/rails/app/templates/public/index.html
index 836da1b689..9fb304a66b 100644
--- a/railties/lib/rails/generators/rails/app/templates/public/index.html
+++ b/railties/lib/rails/generators/rails/app/templates/public/index.html
@@ -82,7 +82,8 @@
       #about-content {
         background-color: #ffd;
         border: 1px solid #fc0;
-        margin-left: -11px;
+        margin-left: -55px;
+        margin-right: -10px;
       }
       #about-content table {
         margin-top: 10px;
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index 9a359d20b1..7f72881d55 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -52,6 +52,12 @@ module ApplicationTests
       assert !middleware.include?("ActionDispatch::Static")
     end
 
+    test "removes show exceptions if action_dispatch.show_exceptions is disabled" do
+      add_to_config "config.action_dispatch.show_exceptions = false"
+      boot!
+      assert !middleware.include?("ActionDispatch::ShowExceptions")
+    end
+
     test "use middleware" do
       use_frameworks []
       add_to_config "config.middleware.use Rack::Config"