Merge commit 'ac7df62a0441b95ec04fd9111a9394795dd53ff2' into glitch-soc/merge-upstream

This commit is contained in:
Thibaut Girka
2018-10-11 14:12:36 +02:00
7 changed files with 44 additions and 10 deletions

View File

@@ -82,4 +82,20 @@ module ApplicationHelper
output << 'rtl' if locale_direction == 'rtl'
output.reject(&:blank?).join(' ')
end
def cdn_host
ENV['CDN_HOST'].presence
end
def cdn_host?
cdn_host.present?
end
def storage_host
ENV['S3_ALIAS_HOST'].presence || ENV['S3_CLOUDFRONT_HOST'].presence
end
def storage_host?
storage_host.present?
end
end