Merge pull request #11514 from schneems/schneems/dev-prod-parity-index

Match Dev/Prod parity for Index Page

3 files changed, 5 insertions, 3 deletions

diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb
index 7a1bb1e25c..1e4c6ca921 100644
--- a/railties/lib/rails/application/finisher.rb
+++ b/railties/lib/rails/application/finisher.rb
@@ -25,9 +25,11 @@ module Rails
             get '/rails/info/properties' => "rails/info#properties"
             get '/rails/info/routes'     => "rails/info#routes"
             get '/rails/info'            => "rails/info#index"
-            get '/'                      => "rails/welcome#index"
           end
         end
+        app.routes.append do
+          get '/' => "rails/welcome#index"
+        end
       end
 
       initializer :build_middleware_stack do
diff --git a/railties/lib/rails/templates/rails/welcome/index.html.erb b/railties/lib/rails/templates/rails/welcome/index.html.erb
index eb620caa00..dd35835c6f 100644
--- a/railties/lib/rails/templates/rails/welcome/index.html.erb
+++ b/railties/lib/rails/templates/rails/welcome/index.html.erb
@@ -227,7 +227,7 @@
 
             <li>
               <h2>Set up a root route to replace this page</h2>
-              <p>You're seeing this page because you're running in development mode and you haven't set a root route yet.</p>
+              <p>You're seeing this page because you haven't set a root route yet.</p>
               <p>Routes are set up in <span class="filename">config/routes.rb</span>.</p>
             </li>
 
diff --git a/railties/test/application/routing_test.rb b/railties/test/application/routing_test.rb
index 8576a2b738..e1679315f8 100644
--- a/railties/test/application/routing_test.rb
+++ b/railties/test/application/routing_test.rb
@@ -60,7 +60,7 @@ module ApplicationTests
     test "rails/welcome in production" do
       app("production")
       get "/"
-      assert_equal 404, last_response.status
+      assert_equal 200, last_response.status
     end
 
     test "rails/info/routes in production" do