diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-06-14 09:56:51 -0700 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-06-14 09:56:51 -0700 |
| commit | 411435a71cc05d4352c62c9efc63be5b2bb60153 (patch) | |
| tree | 0b2292d64352eb19d2988d76d0125a7e29758a64 | |
| parent | deff5977d4ef046106ab5537ffd2eaceceeb1b86 (diff) | |
| parent | c424fb29ab0bbe6ba45f9fd87acd75410a7a07f9 (diff) | |
| download | rails-411435a71cc05d4352c62c9efc63be5b2bb60153.tar.gz rails-411435a71cc05d4352c62c9efc63be5b2bb60153.tar.bz2 rails-411435a71cc05d4352c62c9efc63be5b2bb60153.zip | |
Merge pull request #1698 from bagwanpankaj/master
Removed warnings from while running tests in Ruby 1.9.2
| -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 70ea419e81..65895590bf 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -87,7 +87,7 @@ module ActionDispatch raise ArgumentError, "Regexp multiline option not allowed in routing requirements: #{requirement.inspect}" end end - end + end # match "account/overview" def using_match_shorthand?(path, options) |