diff options
| author | Zachary Scott <e@zzak.io> | 2014-05-31 08:24:42 -0700 |
|---|---|---|
| committer | Zachary Scott <e@zzak.io> | 2014-05-31 08:24:42 -0700 |
| commit | 7c639472fb4514ebd6ed88b278d24e1819a04028 (patch) | |
| tree | 55f1950f2df9c0d03d3deba860b1924d5f5abffd | |
| parent | 3051356a8005518392f3414184daf933f5597092 (diff) | |
| parent | f7b0f4f1e0a732ff70f3704007536bf1c49fce12 (diff) | |
| download | rails-7c639472fb4514ebd6ed88b278d24e1819a04028.tar.gz rails-7c639472fb4514ebd6ed88b278d24e1819a04028.tar.bz2 rails-7c639472fb4514ebd6ed88b278d24e1819a04028.zip | |
Merge pull request #15445 from krautcomputing/fix_asset_host_docs
Update documentation for setting asset_host to a Proc [ci skip]
| -rw-r--r-- | actionview/lib/action_view/helpers/asset_url_helper.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/actionview/lib/action_view/helpers/asset_url_helper.rb b/actionview/lib/action_view/helpers/asset_url_helper.rb index d86e7e490c..006b15be91 100644 --- a/actionview/lib/action_view/helpers/asset_url_helper.rb +++ b/actionview/lib/action_view/helpers/asset_url_helper.rb @@ -88,9 +88,12 @@ module ActionView # still sending assets for plain HTTP requests from asset hosts. If you don't # have SSL certificates for each of the asset hosts this technique allows you # to avoid warnings in the client about mixed media. + # Note that the request parameter might not be supplied, e.g. when the assets + # are precompiled via a Rake task. Make sure to use a Proc instead of a lambda, + # since a Proc allows missing parameters and sets them to nil. # # config.action_controller.asset_host = Proc.new { |source, request| - # if request.ssl? + # if request && request.ssl? # "#{request.protocol}#{request.host_with_port}" # else # "#{request.protocol}assets.example.com" |