diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2016-02-22 23:10:06 -0300 |
---|---|---|
committer | Rafael França <rafaelmfranca@gmail.com> | 2016-02-22 23:10:06 -0300 |
commit | 40200c202a71efe6f3dca7b24cf20b0bf70f5eae (patch) | |
tree | 0e5562533dbf52a487f16b1475a72f00c4edc752 /actionpack/lib/action_dispatch/routing | |
parent | d3f0aa36c388310fbbbcab6295548dc18e385d0f (diff) | |
parent | cd8bb8b6ce96cbfbade45cd5845e5862adf21125 (diff) | |
download | rails-40200c202a71efe6f3dca7b24cf20b0bf70f5eae.tar.gz rails-40200c202a71efe6f3dca7b24cf20b0bf70f5eae.tar.bz2 rails-40200c202a71efe6f3dca7b24cf20b0bf70f5eae.zip |
Merge pull request #23669 from maclover7/internal-routes
Add `internal` attribute to routes
Diffstat (limited to 'actionpack/lib/action_dispatch/routing')
-rw-r--r-- | actionpack/lib/action_dispatch/routing/inspector.rb | 2 | ||||
-rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/routing/inspector.rb b/actionpack/lib/action_dispatch/routing/inspector.rb index 983f1daeb3..6f651a5689 100644 --- a/actionpack/lib/action_dispatch/routing/inspector.rb +++ b/actionpack/lib/action_dispatch/routing/inspector.rb @@ -41,7 +41,7 @@ module ActionDispatch end def internal? - controller.to_s =~ %r{\Arails/(info|mailers|welcome)} + internal end def engine? diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index afbaa45d20..16b430c36e 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -107,6 +107,7 @@ module ActionDispatch @ast = ast @anchor = anchor @via = via + @internal = options[:internal] path_params = ast.find_all(&:symbol?).map(&:to_sym) @@ -148,7 +149,8 @@ module ActionDispatch required_defaults, defaults, request_method, - precedence) + precedence, + @internal) route end |