aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-12-10 19:49:10 -0800
committerSantiago Pastorino <santiago@wyeworks.com>2012-12-10 19:49:10 -0800
commit603e7f7ea507feb3cfea53c42b23be2b32dc240b (patch)
tree1ca5f6e5894c2cfa27a8c3c5ba453bafb05e4392 /actionpack/lib
parent8dac9768b16c6cfaffa6c84abaaa7c4926020e0b (diff)
parentbaea5d69be52def2a81c31cd119f8dfcd2aa087b (diff)
downloadrails-603e7f7ea507feb3cfea53c42b23be2b32dc240b.tar.gz
rails-603e7f7ea507feb3cfea53c42b23be2b32dc240b.tar.bz2
rails-603e7f7ea507feb3cfea53c42b23be2b32dc240b.zip
Merge pull request #8468 from schneems/schneems/rack-index-page
Use Rails to Render Default Index Page
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/routing/inspector.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/inspector.rb b/actionpack/lib/action_dispatch/routing/inspector.rb
index c18dc94d4f..d7412daec2 100644
--- a/actionpack/lib/action_dispatch/routing/inspector.rb
+++ b/actionpack/lib/action_dispatch/routing/inspector.rb
@@ -51,7 +51,7 @@ module ActionDispatch
end
def internal?
- path =~ %r{/rails/info.*|^#{Rails.application.config.assets.prefix}}
+ controller =~ %r{^rails/info|^rails/welcome} || path =~ %r{^#{Rails.application.config.assets.prefix}}
end
def engine?