aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/routing/mapper.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-09-12 15:58:15 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-09-12 15:58:15 -0300
commit0851bd95c7990bc189cb285402a60d67151ec7b9 (patch)
tree0b038bdf2ba1839c14a4991a61eb15bc1425046a /actionpack/lib/action_dispatch/routing/mapper.rb
parentd262773ab7f0aae5de2d354ac2eca168e95b653d (diff)
downloadrails-0851bd95c7990bc189cb285402a60d67151ec7b9.tar.gz
rails-0851bd95c7990bc189cb285402a60d67151ec7b9.tar.bz2
rails-0851bd95c7990bc189cb285402a60d67151ec7b9.zip
Revert "Merge pull request #12208 from mjhoy/patch-1"
This reverts commit ab5cd54b7e791f8419f689d1bef5394890268a6f, reversing changes made to cdc10c898d4865302740340eedec4f5f4ca76565. Reason: This way of defining root path is still supported. See https://github.com/rails/rails/blob/d262773ab7f0aae5de2d354ac2eca168e95b653d/actionpack/test/controller/routing_test.rb#L450-457
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/mapper.rb')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 869fd624db..db9c993590 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -319,6 +319,10 @@ module ActionDispatch
#
# For options, see +match+, as +root+ uses it internally.
#
+ # You can also pass a string which will expand
+ #
+ # root 'pages#main'
+ #
# You should put the root route at the top of <tt>config/routes.rb</tt>,
# because this means it will be matched first. As this is the most popular route
# of most Rails applications, this is beneficial.