aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2013-02-25 20:03:08 -0800
committerGuillermo Iguaran <guilleiguaran@gmail.com>2013-02-25 20:03:08 -0800
commit30859a0bfda5608e1b8ed340a0c4e8574fa609b8 (patch)
tree88f78d46e5e071ebd35911fbe0af2b29ef5e2765 /railties
parent670a2673946e2f933ff1c16699637958ef84c831 (diff)
parent33d92bf69ec5e6f385612b69a6295f5a80332ef8 (diff)
downloadrails-30859a0bfda5608e1b8ed340a0c4e8574fa609b8.tar.gz
rails-30859a0bfda5608e1b8ed340a0c4e8574fa609b8.tar.bz2
rails-30859a0bfda5608e1b8ed340a0c4e8574fa609b8.zip
Merge pull request #9419 from banyan/change-default-root-route-helper
Change default root route helper
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/actions.rb2
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/routes.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/actions.rb b/railties/lib/rails/generators/actions.rb
index cb3aca5811..28593c5907 100644
--- a/railties/lib/rails/generators/actions.rb
+++ b/railties/lib/rails/generators/actions.rb
@@ -215,7 +215,7 @@ module Rails
# Make an entry in Rails routing file config/routes.rb
#
- # route "root :to => 'welcome#index'"
+ # route "root 'welcome#index'"
def route(routing_code)
log :route, routing_code
sentinel = /\.routes\.draw do\s*$/
diff --git a/railties/lib/rails/generators/rails/app/templates/config/routes.rb b/railties/lib/rails/generators/rails/app/templates/config/routes.rb
index 22a6aeb5fe..f877fa1f8a 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/routes.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/routes.rb
@@ -3,7 +3,7 @@
# See how all your routes lay out with "rake routes".
# You can have the root of your site routed with "root"
- # root to: 'welcome#index'
+ # root 'welcome#index'
# Example of regular route:
# get 'products/:id' => 'catalog#view'