aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2015-05-30 16:56:36 +0200
committerKasper Timm Hansen <kaspth@gmail.com>2015-05-30 16:56:36 +0200
commiteefd4c0d28daf3d71a84996fff6714f8d65a94b0 (patch)
tree5714972d2bec58b54d9d9aa2c4c577989bf3894b /actionpack/lib/action_dispatch
parent534ca83ea56ec17e64cbdd57811b37b82c080c5d (diff)
parent68aafd6dd7424e28db5717c2f45476a65b136658 (diff)
downloadrails-eefd4c0d28daf3d71a84996fff6714f8d65a94b0.tar.gz
rails-eefd4c0d28daf3d71a84996fff6714f8d65a94b0.tar.bz2
rails-eefd4c0d28daf3d71a84996fff6714f8d65a94b0.zip
Merge pull request #20378 from vngrs/fix_doc_of_match_method
match method doc fix [ci skip]
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb9
1 files changed, 6 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 00d3f03591..15980db39b 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -1450,9 +1450,12 @@ module ActionDispatch
parent_resource.instance_of?(Resource) && @scope[:shallow]
end
- # match 'path' => 'controller#action'
- # match 'path', to: 'controller#action'
- # match 'path', 'otherpath', on: :member, via: :get
+ # Matches a url pattern to one or more routes.
+ # For more information, see match[rdoc-ref:Base#match].
+ #
+ # match 'path' => 'controller#action', via: patch
+ # match 'path', to: 'controller#action', via: :post
+ # match 'path', 'otherpath', on: :member, via: :get
def match(path, *rest)
if rest.empty? && Hash === path
options = path