aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/sprockets
diff options
context:
space:
mode:
authorJonathan del Strother <jon.delStrother@audioboo.fm>2011-11-17 11:48:12 +0000
committerJonathan del Strother <jon.delStrother@audioboo.fm>2011-12-01 11:57:33 +0000
commit88237daae48c9867fca3b0e14e779d4f4cdd88d0 (patch)
tree822b78cb2d4d925e534ca403cd6df508afbeef06 /actionpack/lib/sprockets
parentcb7145700d6fd31ef316d97590815ce73bb08cbd (diff)
downloadrails-88237daae48c9867fca3b0e14e779d4f4cdd88d0.tar.gz
rails-88237daae48c9867fca3b0e14e779d4f4cdd88d0.tar.bz2
rails-88237daae48c9867fca3b0e14e779d4f4cdd88d0.zip
Leave default_asset_host_protocol unset
When default_asset_host_protocol is left as nil, it will use absolute protocols when a request is present, and relative protocols otherwise (eg in asset generation)
Diffstat (limited to 'actionpack/lib/sprockets')
-rw-r--r--actionpack/lib/sprockets/railtie.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb
index 3d330bd91a..a7eb03acaf 100644
--- a/actionpack/lib/sprockets/railtie.rb
+++ b/actionpack/lib/sprockets/railtie.rb
@@ -10,8 +10,6 @@ module Sprockets
# TODO: Get rid of config.assets.enabled
class Railtie < ::Rails::Railtie
- config.action_controller.default_asset_host_protocol = :relative
-
rake_tasks do
load "sprockets/assets.rake"
end