Fix missing protocol in dns-prefetch, improve code style (#8963)

Regression from #8942
master
Eugen Rochko 6 years ago committed by GitHub
parent 5cbbd2c3b5
commit 22de24b8ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      app/helpers/application_helper.rb
  2. 6
      app/views/layouts/embedded.html.haml
  3. 2
      config/environments/production.rb

@ -83,7 +83,7 @@ module ApplicationHelper
end
def cdn_host
ENV['CDN_HOST'].presence
Rails.configuration.action_controller.asset_host
end
def cdn_host?
@ -91,10 +91,10 @@ module ApplicationHelper
end
def storage_host
ENV['S3_ALIAS_HOST'].presence || ENV['S3_CLOUDFRONT_HOST'].presence
"https://#{ENV['S3_ALIAS_HOST'].presence || ENV['S3_CLOUDFRONT_HOST']}"
end
def storage_host?
storage_host.present?
ENV['S3_ALIAS_HOST'].present? || ENV['S3_CLOUDFRONT_HOST'].present?
end
end

@ -4,6 +4,12 @@
%meta{ charset: 'utf-8' }/
%meta{ name: 'robots', content: 'noindex' }/
- if cdn_host?
%link{ rel: 'dns-prefetch', href: cdn_host }/
- if storage_host?
%link{ rel: 'dns-prefetch', href: storage_host }/
= stylesheet_pack_tag 'common', media: 'all'
= stylesheet_pack_tag Setting.default_settings['theme'], media: 'all'
= javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'

@ -13,7 +13,7 @@ Rails.application.configure do
# Full error reports are disabled and caching is turned on.
config.consider_all_requests_local = false
config.action_controller.perform_caching = true
config.action_controller.asset_host = ENV['CDN_HOST'] if ENV.key?('CDN_HOST')
config.action_controller.asset_host = ENV['CDN_HOST'] if ENV['CDN_HOST'].present?
# Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"]
# or in config/master.key. This key is used to decrypt credentials (and other encrypted files).

Loading…
Cancel
Save