aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2018-09-27 16:57:35 -0400
committerGitHub <noreply@github.com>2018-09-27 16:57:35 -0400
commit16e6d42b225bc4dbdb6d96338df5a60ca4ce3f4e (patch)
tree73e339c6e71c3e6399432179da25f490b882cbf3 /actionpack/lib/action_dispatch
parent8ad897fdedff6eb09daeb856786f3cc555b5c4e5 (diff)
parent7670d60977a7de3d11a8a9004b8a7a1c60383ee7 (diff)
downloadrails-16e6d42b225bc4dbdb6d96338df5a60ca4ce3f4e.tar.gz
rails-16e6d42b225bc4dbdb6d96338df5a60ca4ce3f4e.tar.bz2
rails-16e6d42b225bc4dbdb6d96338df5a60ca4ce3f4e.zip
Merge pull request #34002 from gmcgibbon/fix_deeply_nested_scoped_root
Fix optionally scoped root route unscoped access
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb2
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 8386cb9689..8b5a39dcaf 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -402,7 +402,7 @@ module ActionDispatch
# for root cases, where the latter is the correct one.
def self.normalize_path(path)
path = Journey::Router::Utils.normalize_path(path)
- path.gsub!(%r{/(\(+)/?}, '\1/') unless path =~ %r{^/\(+[^)]+\)$}
+ path.gsub!(%r{/(\(+)/?}, '\1/') unless path =~ %r{^/(\(+[^)]+\)){1,}$}
path
end