Merge commit 'c15c8c7aa8
' into kb_migration
This commit is contained in:
commit
093cfdbb7b
208 changed files with 2976 additions and 5888 deletions
|
@ -173,11 +173,11 @@ module ApplicationHelper
|
|||
end
|
||||
|
||||
def storage_host
|
||||
URI::HTTPS.build(host: storage_host_name).to_s
|
||||
"https://#{storage_host_var}"
|
||||
end
|
||||
|
||||
def storage_host?
|
||||
storage_host_name.present?
|
||||
storage_host_var.present?
|
||||
end
|
||||
|
||||
def quote_wrap(text, line_width: 80, break_sequence: "\n")
|
||||
|
@ -248,7 +248,7 @@ module ApplicationHelper
|
|||
|
||||
private
|
||||
|
||||
def storage_host_name
|
||||
def storage_host_var
|
||||
ENV.fetch('S3_ALIAS_HOST', nil) || ENV.fetch('S3_CLOUDFRONT_HOST', nil)
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue