Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

Match Dev/Prod parity for Index Page
  • Loading branch information...
commit 230d2f84a1877df47d55524e3903fb6d3e4dee75 2 parents ff3739e + b0caea2
Piotr Sarnacki drogus authored
4 railties/lib/rails/application/finisher.rb
View
@@ -25,9 +25,11 @@ module Finisher
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
2  railties/lib/rails/templates/rails/welcome/index.html.erb
View
@@ -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>
2  railties/test/application/routing_test.rb
View
@@ -60,7 +60,7 @@ def index
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
Please sign in to comment.
Something went wrong with that request. Please try again.