summaryrefslogtreecommitdiff
path: root/config/application.rb
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-02-01 13:05:33 -0600
committerMike Greiling <mike@pixelcog.com>2017-02-01 16:23:26 -0600
commita2d837a3719187a906b60b9212b0dbf02396cb59 (patch)
tree08da24dda249c97816cf299e9105ad57bc2e4552 /config/application.rb
parent6fffdf7f2e72128eac53adfd734deb4fad8421fa (diff)
downloadgitlab-ce-a2d837a3719187a906b60b9212b0dbf02396cb59.tar.gz
add rack middleware to proxy webpack dev server
Diffstat (limited to 'config/application.rb')
-rw-r--r--config/application.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb
index 4efe73c7798..9088d3c432b 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -84,6 +84,8 @@ module Gitlab
config.webpack.config_file = "config/webpack.config.js"
config.webpack.output_dir = "public/assets/webpack"
config.webpack.public_path = "assets/webpack"
+
+ # Webpack dev server configuration is handled in initializers/static_files.rb
config.webpack.dev_server.enabled = false
# Enable the asset pipeline