diff options
| author | Prem Sichanugrist <s@sikachu.com> | 2011-03-22 22:19:31 +0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-03-22 09:19:40 -0700 |
| commit | 2ddfdba9a0dab7d8499c3ad0d13583bddbac4f69 (patch) | |
| tree | dd3ea564ad557d83227355616aabd0eb18b1aa92 /actionpack/lib | |
| parent | 15d3cc21f41af4b3caaae4f3586481effa77058f (diff) | |
| download | rails-2ddfdba9a0dab7d8499c3ad0d13583bddbac4f69.tar.gz rails-2ddfdba9a0dab7d8499c3ad0d13583bddbac4f69.tar.bz2 rails-2ddfdba9a0dab7d8499c3ad0d13583bddbac4f69.zip | |
Do not show optional (.:format) block for wildcard route [#6605 state:resolved]
This will make the output of `rake routes` to be correctly match to the behavior of the application, as the regular expression used to match the path is greedy and won't capture the format part by default
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 2 |
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 cc6b8aa82d..1dba1d416c 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -107,7 +107,7 @@ module ActionDispatch if @options[:format] == false @options.delete(:format) path - elsif path.include?(":format") || path.end_with?('/') + elsif path.include?(":format") || path.end_with?('/') || path.match(/^\/?\*/) path else "#{path}(.:format)" |