diff options
| author | José Valim <jose.valim@gmail.com> | 2011-12-01 04:18:41 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-12-01 04:18:41 -0800 |
| commit | f8b934224fec676a7f169caf9c2d0e61ca5c9a35 (patch) | |
| tree | 822b78cb2d4d925e534ca403cd6df508afbeef06 /actionpack | |
| parent | cb7145700d6fd31ef316d97590815ce73bb08cbd (diff) | |
| parent | 88237daae48c9867fca3b0e14e779d4f4cdd88d0 (diff) | |
| download | rails-f8b934224fec676a7f169caf9c2d0e61ca5c9a35.tar.gz rails-f8b934224fec676a7f169caf9c2d0e61ca5c9a35.tar.bz2 rails-f8b934224fec676a7f169caf9c2d0e61ca5c9a35.zip | |
Merge pull request #3660 from jdelStrother/asset_protocol
default_asset_host_protocol should not default to :relative
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/sprockets/railtie.rb | 2 |
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 |