summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-06-12 11:48:32 -0700
committerStan Hu <stanhu@gmail.com>2017-06-12 15:11:23 -0700
commitfbc8d8f24318b08fe1b4b57dd1abddd65526a5f0 (patch)
treed922482c33027ade0e6628a0febc589298e3a9b5
parentde20057ccbd3b8c94d64ff5d8deb14cab232d08a (diff)
downloadgitlab-ce-sh-support-cdns.tar.gz
Support a configurable Rails asset_host to allow for CDNssh-support-cdns
Adds support for https://gitlab.com/gitlab-com/infrastructure/issues/57
-rw-r--r--config/environments/production.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 82a19085b1d..87b94d74506 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -50,7 +50,7 @@ Rails.application.configure do
# config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
# Enable serving of images, stylesheets, and JavaScripts from an asset server
- # config.action_controller.asset_host = "http://assets.example.com"
+ config.action_controller.asset_host = ENV['CDN_HOST'] if ENV['CDN_HOST'].present?
# Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
# config.assets.precompile += %w( search.js )