aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorZachary Scott <e@zzak.io>2015-04-25 23:15:34 -0700
committerZachary Scott <e@zzak.io>2015-04-25 23:15:34 -0700
commitfc0460a32c0b2fd583a64eb42df40a8865090190 (patch)
tree70115be5139f41490f8bc8aff1c2b7741b8163af /actionpack
parent8c180cdaf69f07eb0ffd502dfc6c82a0b0281c48 (diff)
downloadrails-fc0460a32c0b2fd583a64eb42df40a8865090190.tar.gz
rails-fc0460a32c0b2fd583a64eb42df40a8865090190.tar.bz2
rails-fc0460a32c0b2fd583a64eb42df40a8865090190.zip
Remove internal hacks dependent on Sprockets from RouteWrapper
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/routing/inspector.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/actionpack/lib/action_dispatch/routing/inspector.rb b/actionpack/lib/action_dispatch/routing/inspector.rb
index bd6940fd47..48c10a7d4c 100644
--- a/actionpack/lib/action_dispatch/routing/inspector.rb
+++ b/actionpack/lib/action_dispatch/routing/inspector.rb
@@ -45,11 +45,7 @@ module ActionDispatch
end
def internal?
- internal_controller = controller.to_s =~ %r{\arails/(info|mailers|welcome)}
- internal_asset = Rails.application.config.respond_to?(:assets) &&
- path =~ %r{\a#{Rails.application.config.assets.prefix}\z}
-
- internal_controller || internal_asset
+ controller.to_s =~ %r{\Arails/(info|mailers|welcome)}
end
def engine?