diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-24 14:26:29 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-24 14:26:29 -0300 |
| commit | 5b23e31771b898cf5e715e72f75dd9427c0a0875 (patch) | |
| tree | 2797eebf235cf715727c4f34accd3857f3028ddb /actionpack | |
| parent | 5ee87777af0d2baa8bd6e6578a9ab96f70e718f9 (diff) | |
| parent | 8ee785a17fa0dab88762c2866507bb33760c9f7a (diff) | |
| download | rails-5b23e31771b898cf5e715e72f75dd9427c0a0875.tar.gz rails-5b23e31771b898cf5e715e72f75dd9427c0a0875.tar.bz2 rails-5b23e31771b898cf5e715e72f75dd9427c0a0875.zip | |
Merge pull request #15836 from DNNX/router-swap-select-sort
Replace x.sort_by!.select! with x.select!.sort_by!
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/journey/router.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/journey/router.rb b/actionpack/lib/action_dispatch/journey/router.rb index fe3fc0a9fa..21817b374c 100644 --- a/actionpack/lib/action_dispatch/journey/router.rb +++ b/actionpack/lib/action_dispatch/journey/router.rb @@ -105,7 +105,8 @@ module ActionDispatch routes.concat get_routes_as_head(routes) end - routes.sort_by!(&:precedence).select! { |r| r.matches?(req) } + routes.select! { |r| r.matches?(req) } + routes.sort_by!(&:precedence) routes.map! { |r| match_data = r.path.match(req.path_info) |