summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2019-04-09 09:32:15 -0500
committerMike Greiling <mike@pixelcog.com>2019-04-09 09:32:15 -0500
commit8e02b9715c9481d5557e921fcde0f93887ecfc44 (patch)
tree4f04973797ff462da4ffe636b19135513f242b10
parent74ac04a6aa7a9398ed908f47080e64ec40e0dee8 (diff)
downloadgitlab-ce-mg-allow-dev-mode-cdn.tar.gz
Recognize GITLAB_CDN_HOST in dev modemg-allow-dev-mode-cdn
-rw-r--r--config/environments/development.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 494ddd72556..76739c992f1 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -10,6 +10,9 @@ Rails.application.configure do
config.consider_all_requests_local = true
config.action_controller.perform_caching = false
+ # Enable serving of images, stylesheets, and JavaScripts from an asset server
+ config.action_controller.asset_host = ENV['GITLAB_CDN_HOST'] if ENV['GITLAB_CDN_HOST'].present?
+
# Don't care if the mailer can't send
config.action_mailer.raise_delivery_errors = false