diff options
| author | pluralcafe-docker <git@plural.cafe> | 2018-10-30 05:54:55 +0000 |
|---|---|---|
| committer | pluralcafe-docker <git@plural.cafe> | 2018-10-30 05:54:55 +0000 |
| commit | 431c09bfbe07715a2a88846864179a419d72ab59 (patch) | |
| tree | 8b7772f64ea23cdf5e55dda9f92ff57a41adf3a4 /app/helpers | |
| parent | 7c96ee7815c216d6ac3b748d7dd6959376d3914e (diff) | |
| parent | 7ec3f6022d5c991bb584c481a29c416e9f1c5438 (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/application_helper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index e9b48fa98..5e7fdffb0 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -84,7 +84,7 @@ module ApplicationHelper end def cdn_host - ENV['CDN_HOST'].presence + Rails.configuration.action_controller.asset_host end def cdn_host? @@ -92,10 +92,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 |