aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorEarl St Sauver <estsauver@gmail.com>2013-08-29 18:17:48 -0700
committerEarl St Sauver <estsauver@gmail.com>2013-08-30 21:18:32 -0700
commit374bda72df507dc7a672199e71d2e14dc732bba0 (patch)
tree762535cfeb8279f0243a2c65ea830eeebca4b23a /actionpack
parent1f57a1503d31f47869ab734cfebd367fef586186 (diff)
downloadrails-374bda72df507dc7a672199e71d2e14dc732bba0.tar.gz
rails-374bda72df507dc7a672199e71d2e14dc732bba0.tar.bz2
rails-374bda72df507dc7a672199e71d2e14dc732bba0.zip
Update mapper documenation for match helper [ci skip]
This piece of documentation is out of date. The use of match without any via option is prevented, now the HTTP verbs have to be explicitly set. If they're not set then the error message in normalize_conditions! (around line 186) is shown.
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 288ce3e867..600c49e442 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -362,8 +362,9 @@ module ActionDispatch
# # Yes, controller actions are just rack endpoints
# match 'photos/:id', to: PhotosController.action(:show)
#
- # Because request various HTTP verbs with a single action has security
- # implications, is recommendable use HttpHelpers[rdoc-ref:HttpHelpers]
+ # Because requesting various HTTP verbs with a single action has security
+ # implications, you must either specify the actions in
+ # the via options or use one of the HtttpHelpers[rdoc-ref:HttpHelpers]
# instead +match+
#
# === Options