aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClaudio B. <claudiob@users.noreply.github.com>2015-05-30 06:13:19 -0700
committerClaudio B. <claudiob@users.noreply.github.com>2015-05-30 06:13:19 -0700
commit534ca83ea56ec17e64cbdd57811b37b82c080c5d (patch)
tree7fb27cbc902ae24d29cddf35be8ec7e148ec2db1
parentd7cbdbef1857f1359201234e02933ba3bfed2a14 (diff)
parent9c93b8cd070a936def95ed17de456f69855e5b05 (diff)
downloadrails-534ca83ea56ec17e64cbdd57811b37b82c080c5d.tar.gz
rails-534ca83ea56ec17e64cbdd57811b37b82c080c5d.tar.bz2
rails-534ca83ea56ec17e64cbdd57811b37b82c080c5d.zip
Merge pull request #20375 from yoongkang/docfix
[ci skip] match without via is now deprecated
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 0a444ddffc..00d3f03591 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -806,7 +806,7 @@ module ActionDispatch
# Scopes routes to a specific controller
#
# controller "food" do
- # match "bacon", action: "bacon"
+ # match "bacon", action: :bacon, via: :get
# end
def controller(controller, options={})
options[:controller] = controller