aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-02-05 23:26:39 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2012-02-05 23:26:39 -0700
commit007c41100b06db53630ce60048eaa625a9e955ee (patch)
treeddecebe7027eba822a80d2e4dc78d2b399977c33 /actionpack
parentb8f2a43ce2fa18173d72ca2593b70dcda48dff5f (diff)
downloadrails-007c41100b06db53630ce60048eaa625a9e955ee.tar.gz
rails-007c41100b06db53630ce60048eaa625a9e955ee.tar.bz2
rails-007c41100b06db53630ce60048eaa625a9e955ee.zip
Note the ways #match may be called
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index b601fcdb3d..ae67b71a27 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1249,6 +1249,9 @@ module ActionDispatch
parent_resource.instance_of?(Resource) && @scope[:shallow]
end
+ # match 'path' => 'controller#action'
+ # match 'path', as: 'controller#action'
+ # match 'path', 'otherpath', on: :member, via: :get
def match(path, *rest)
if rest.empty? && Hash === path
options = path