diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2013-04-03 06:34:24 -0700 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2013-04-03 06:34:24 -0700 |
| commit | 5120e5596c7e5cb58004cb264e93a4670ee0e8f6 (patch) | |
| tree | 25bf88a6b50dda6a5191cbdae7daa21c190e59a9 /actionpack/lib | |
| parent | 979adea8787ef88f62b8dcc1962ae8ce3481978b (diff) | |
| parent | 33971922b3af559d6583b472d1520bc4d13daccc (diff) | |
| download | rails-5120e5596c7e5cb58004cb264e93a4670ee0e8f6.tar.gz rails-5120e5596c7e5cb58004cb264e93a4670ee0e8f6.tar.bz2 rails-5120e5596c7e5cb58004cb264e93a4670ee0e8f6.zip | |
Merge pull request #10072 from senny/10071_format_on_scope_block_is_ignored
fix regression in Mapper when `format:` was used in a `scope`.
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 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! |