aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-10-26 11:23:39 -0500
committerJoshua Peek <josh@joshpeek.com>2009-10-26 11:23:39 -0500
commit55ae53baadf37daf2c966bf5d9d67c1f954cb681 (patch)
tree2b7466675d2e319a0cd7f187092158b479e5faaf /actionpack/lib
parent6083a87d63af9ca1b66fedcb92cd4a395965173b (diff)
downloadrails-55ae53baadf37daf2c966bf5d9d67c1f954cb681.tar.gz
rails-55ae53baadf37daf2c966bf5d9d67c1f954cb681.tar.bz2
rails-55ae53baadf37daf2c966bf5d9d67c1f954cb681.zip
Fix `rake routes` method name output [#3422 state:resolved]
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/routing/route.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route.rb b/actionpack/lib/action_dispatch/routing/route.rb
index e3aaa29e76..f1431e7a37 100644
--- a/actionpack/lib/action_dispatch/routing/route.rb
+++ b/actionpack/lib/action_dispatch/routing/route.rb
@@ -27,8 +27,13 @@ module ActionDispatch
end
def verb
- if verb = conditions[:verb]
- verb.to_s.upcase
+ if method = conditions[:request_method]
+ case method
+ when Regexp
+ method.source.upcase
+ else
+ method.to_s.upcase
+ end
end
end