diff options
| author | bikebilly <fabio@gitlab.com> | 2017-08-03 10:05:56 +0200 |
|---|---|---|
| committer | bikebilly <fabio@gitlab.com> | 2017-08-03 10:05:56 +0200 |
| commit | 40dfddd4077da4d594bd9e8956e1fcb1c99434e6 (patch) | |
| tree | d0761ed84471c22b3b0949720e3e0734e8645aac /config/environments/production.rb | |
| parent | ed5445388de13f1d126fec14cc0a9ea9ae03b397 (diff) | |
| parent | dc412b48693668f7fba3adea57b8be76685afa76 (diff) | |
| download | gitlab-ce-40dfddd4077da4d594bd9e8956e1fcb1c99434e6.tar.gz | |
Merge branch 'master' into 33329-tech-article-deploying-maven-artifacts
Diffstat (limited to 'config/environments/production.rb')
| -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 ) |