diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2013-03-03 11:34:23 -0800 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2013-03-03 11:34:23 -0800 |
| commit | 0108eaf3c1f4a769343889d5ef3e69045437c9b7 (patch) | |
| tree | f7de7b67d096b81a7dfdb3234b443e7ac9ecd3d9 /actionpack | |
| parent | d2b9862b247693af16ad00e56d4510ef460bcea7 (diff) | |
| parent | 98739cf45fbcf2bbaa53bdf23bf4aa0250eca1c7 (diff) | |
| download | rails-0108eaf3c1f4a769343889d5ef3e69045437c9b7.tar.gz rails-0108eaf3c1f4a769343889d5ef3e69045437c9b7.tar.bz2 rails-0108eaf3c1f4a769343889d5ef3e69045437c9b7.zip | |
Merge pull request #9528 from korny/patch-1
Fix unused variable warning in mapper.rb
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 6b272704ea..d71b21efc3 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -67,8 +67,6 @@ module ActionDispatch private def normalize_options! - path_without_format = @path.sub(/\(\.:format\)$/, '') - @options.merge!(default_controller_and_action) requirements.each do |name, requirement| |