diff options
| -rw-r--r-- | railties/lib/rails/application/finisher.rb | 4 | ||||
| -rw-r--r-- | railties/lib/rails/templates/rails/welcome/index.html.erb | 2 | ||||
| -rw-r--r-- | railties/test/application/routing_test.rb | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/railties/lib/rails/application/finisher.rb b/railties/lib/rails/application/finisher.rb index 1e4c6ca921..7a1bb1e25c 100644 --- a/railties/lib/rails/application/finisher.rb +++ b/railties/lib/rails/application/finisher.rb @@ -25,11 +25,9 @@ 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 dd35835c6f..eb620caa00 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 haven't set a root route yet.</p> + <p>You're seeing this page because you're running in development mode and 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 e1679315f8..8576a2b738 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 200, last_response.status + assert_equal 404, last_response.status end test "rails/info/routes in production" do |