aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorArthur Neves <arthurnn@gmail.com>2015-04-26 11:23:08 -0400
committerArthur Neves <arthurnn@gmail.com>2015-04-26 11:25:33 -0400
commit757a2bc3e3e52a5d9418656928db993db42b741b (patch)
treeda07915d19a05b0ad2461663df8f98fe56e3f1c5 /actionpack
parent66fe53118f890252118841d78b43fd5560a8f47f (diff)
downloadrails-757a2bc3e3e52a5d9418656928db993db42b741b.tar.gz
rails-757a2bc3e3e52a5d9418656928db993db42b741b.tar.bz2
rails-757a2bc3e3e52a5d9418656928db993db42b741b.zip
Don't reference sprockets assets on action pack
We need to ignore the `assets_prefix` when running a command like `rake routes`. However we cannot reference asserts_prefix from action_pack as that is a sprockets-rails concern. See this is now implemented on sprockets-rails https://github.com/rails/sprockets-rails/commit/85b89c44ad40af3056899808475e6e4bf65c1f5a
Diffstat (limited to 'actionpack')
-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 c513737fc2..48c10a7d4c 100644
--- a/actionpack/lib/action_dispatch/routing/inspector.rb
+++ b/actionpack/lib/action_dispatch/routing/inspector.rb
@@ -45,7 +45,7 @@ module ActionDispatch
end
def internal?
- controller.to_s =~ %r{\Arails/(info|mailers|welcome)} || path =~ %r{\A#{Rails.application.config.assets.prefix}\z}
+ controller.to_s =~ %r{\Arails/(info|mailers|welcome)}
end
def engine?