diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-04-03 15:01:01 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-04-03 15:01:01 +0200 |
| commit | 33971922b3af559d6583b472d1520bc4d13daccc (patch) | |
| tree | 900188b545a095d1cdd66ebd3fed09ad0ac02f9c /actionpack/lib/action_dispatch/routing | |
| parent | 37683266d86db2b7c39cb32a1e39e3698f6a93a8 (diff) | |
| download | rails-33971922b3af559d6583b472d1520bc4d13daccc.tar.gz rails-33971922b3af559d6583b472d1520bc4d13daccc.tar.bz2 rails-33971922b3af559d6583b472d1520bc4d13daccc.zip | |
fix regression in Mapper when `format:` was used in a `scope`.
Closes #10071
`#normalize_path!` depends on the options so we need to call
`#normalize_options!` first to make sure everything is set correctly.
Diffstat (limited to 'actionpack/lib/action_dispatch/routing')
| -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 c5f2b33602..399f6529a7 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -58,8 +58,8 @@ module ActionDispatch @set, @scope, @path, @options = set, scope, path, options @requirements, @conditions, @defaults = {}, {}, {} - normalize_path! normalize_options! + normalize_path! normalize_requirements! normalize_conditions! normalize_defaults! |