diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-06-15 20:10:50 +0000 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-06-19 09:42:04 -0500 |
| commit | ea46d818986d512878fb686166f8504e852c3147 (patch) | |
| tree | 525b188db871b46cd099ec20f0c9e5d63833f7ef /config | |
| parent | 10c9601265209f4d035bd3bf6bc6703f0c5995a6 (diff) | |
| download | gitlab-ce-ea46d818986d512878fb686166f8504e852c3147.tar.gz | |
Merge branch 'sh-support-cdns' into 'master'
Support a configurable Rails asset_host to allow for CDNs
See merge request !12102
Diffstat (limited to 'config')
| -rw-r--r-- | config/environments/production.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/environments/production.rb b/config/environments/production.rb index 82a19085b1d..c5cbfcf64cf 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['GITLAB_CDN_HOST'] if ENV['GITLAB_CDN_HOST'].present? # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added) # config.assets.precompile += %w( search.js ) |