Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #15445 from krautcomputing/fix_asset_host_docs

Update documentation for setting asset_host to a Proc [ci skip]
  • Loading branch information...
commit 7c639472fb4514ebd6ed88b278d24e1819a04028 2 parents 3051356 + f7b0f4f
@zzak zzak authored
Showing with 4 additions and 1 deletion.
  1. +4 −1 actionview/lib/action_view/helpers/asset_url_helper.rb
View
5 actionview/lib/action_view/helpers/asset_url_helper.rb
@@ -88,9 +88,12 @@ module Helpers
# 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"
Please sign in to comment.
Something went wrong with that request. Please try again.