diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-10-12 02:19:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-12 02:19:10 +0200 |
| commit | 22de24b8ca707d8eac26eab6615377a290ff1f4e (patch) | |
| tree | 2fae034dd8a0597e34ace588f85227c9be490b03 /app | |
| parent | 5cbbd2c3b5b1298dc0ed5a0110c20a49bdb7d84e (diff) | |
Fix missing protocol in dns-prefetch, improve code style (#8963)
Regression from #8942
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/application_helper.rb | 6 | ||||
| -rw-r--r-- | app/views/layouts/embedded.html.haml | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 8533b398a..c33975cac 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.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 diff --git a/app/views/layouts/embedded.html.haml b/app/views/layouts/embedded.html.haml index ac11cfbe7..0503dcdc1 100644 --- a/app/views/layouts/embedded.html.haml +++ b/app/views/layouts/embedded.html.haml @@ -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' |