diff options
| author | José Valim <jose.valim@gmail.com> | 2011-09-15 18:08:42 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-09-15 18:08:42 -0700 |
| commit | 79c7f2337645bade3a80271d76acc8f141d7c4d5 (patch) | |
| tree | 7c82f1dc90150fc4c26f389af5139b0cb53484fe /actionpack/lib | |
| parent | 8a32a58f6f95deeae1ffe6f5dba9c4d71fbc8dff (diff) | |
| parent | b50394bf844d0520d5dca485b169bba87f6d009a (diff) | |
| download | rails-79c7f2337645bade3a80271d76acc8f141d7c4d5.tar.gz rails-79c7f2337645bade3a80271d76acc8f141d7c4d5.tar.bz2 rails-79c7f2337645bade3a80271d76acc8f141d7c4d5.zip | |
Merge pull request #3040 from guilleiguaran/asset-host-should-not-be-nil-precompile
config.action_controller.asset_host shouldn't set to nil during precompile
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/sprockets/assets.rake | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/actionpack/lib/sprockets/assets.rake b/actionpack/lib/sprockets/assets.rake index 9b2f3a3f94..81223b7ead 100644 --- a/actionpack/lib/sprockets/assets.rake +++ b/actionpack/lib/sprockets/assets.rake @@ -17,9 +17,6 @@ namespace :assets do # Always compile files Rails.application.config.assets.compile = true - # Always ignore asset host - Rails.application.config.action_controller.asset_host = nil - config = Rails.application.config env = Rails.application.assets target = Pathname.new(File.join(Rails.public_path, config.assets.prefix)) |