diff options
| author | José Valim <jose.valim@gmail.com> | 2011-10-05 02:07:25 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-10-05 02:08:02 +0200 |
| commit | 5711a35ad8faa3fb6d138b234cbe9acfad27a9a8 (patch) | |
| tree | 9b40f5b0d2c29b21239b732fcb1830b7013db1cc /actionpack/lib/sprockets/railtie.rb | |
| parent | ac2f6bd6431311b1eae9d8ac6c217d2c2fbc2b3d (diff) | |
| download | rails-5711a35ad8faa3fb6d138b234cbe9acfad27a9a8.tar.gz rails-5711a35ad8faa3fb6d138b234cbe9acfad27a9a8.tar.bz2 rails-5711a35ad8faa3fb6d138b234cbe9acfad27a9a8.zip | |
Ensure default_asset_host_protocol is respected, closes #2980.
Diffstat (limited to 'actionpack/lib/sprockets/railtie.rb')
| -rw-r--r-- | actionpack/lib/sprockets/railtie.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb index 6e93bd3035..2cf54b7777 100644 --- a/actionpack/lib/sprockets/railtie.rb +++ b/actionpack/lib/sprockets/railtie.rb @@ -1,3 +1,5 @@ +require "action_controller/railtie" + module Sprockets autoload :Bootstrap, "sprockets/bootstrap" autoload :Helpers, "sprockets/helpers" @@ -8,7 +10,7 @@ module Sprockets # TODO: Get rid of config.assets.enabled class Railtie < ::Rails::Railtie - config.default_asset_host_protocol = :relative + config.action_controller.default_asset_host_protocol = :relative rake_tasks do load "sprockets/assets.rake" |