aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Bejar <jorge@wyeworks.com>2015-05-05 17:18:17 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2015-06-11 16:54:14 -0300
commit11c71b207e11e6a94b65f5e480845ecc3a06de0d (patch)
treefb476d1fe7ffa188c33b63d8bd1fc096d168317e
parent08cfe34174d5cb496d4a312858ca46431463b5a8 (diff)
downloadrails-11c71b207e11e6a94b65f5e480845ecc3a06de0d.tar.gz
rails-11c71b207e11e6a94b65f5e480845ecc3a06de0d.tar.bz2
rails-11c71b207e11e6a94b65f5e480845ecc3a06de0d.zip
Revert changes related with api apps in RouteWrapper
See the following commit to have context about this change: https://github.com/rails/rails/commit/757a2bc3e3e52a5d9418656928db993db42b741b
-rw-r--r--actionpack/lib/action_dispatch/routing/inspector.rb12
1 files changed, 1 insertions, 11 deletions
diff --git a/actionpack/lib/action_dispatch/routing/inspector.rb b/actionpack/lib/action_dispatch/routing/inspector.rb
index aa507f59c7..48c10a7d4c 100644
--- a/actionpack/lib/action_dispatch/routing/inspector.rb
+++ b/actionpack/lib/action_dispatch/routing/inspector.rb
@@ -45,22 +45,12 @@ module ActionDispatch
end
def internal?
- internal_controller? || internal_asset?
+ controller.to_s =~ %r{\Arails/(info|mailers|welcome)}
end
def engine?
rack_app.respond_to?(:routes)
end
-
- private
- def internal_controller?
- controller.to_s =~ %r{\arails/(info|mailers|welcome)}
- end
-
- def internal_asset?
- Rails.application.config.respond_to?(:assets) &&
- path =~ %r{\a#{Rails.application.config.assets.prefix}\z}
- end
end
##