diff options
| author | Mike Greiling <mike@pixelcog.com> | 2016-11-03 19:11:38 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-01-10 12:30:39 -0600 |
| commit | 720650d2b0a978700edfd759c0928598f2b0ae0b (patch) | |
| tree | 90f6905915aecd7542b6204ff066d23b4d0c0dfa /config | |
| parent | 24b48a37131546f5927805e3be7d88e07dbfa9af (diff) | |
| download | gitlab-ce-720650d2b0a978700edfd759c0928598f2b0ae0b.tar.gz | |
precompile webpack assets when testing
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 1 | ||||
| -rw-r--r-- | config/environments/development.rb | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index 7607c7a61b2..4efe73c7798 100644 --- a/config/application.rb +++ b/config/application.rb @@ -84,6 +84,7 @@ module Gitlab config.webpack.config_file = "config/webpack.config.js" config.webpack.output_dir = "public/assets/webpack" config.webpack.public_path = "assets/webpack" + config.webpack.dev_server.enabled = false # Enable the asset pipeline config.assets.enabled = true diff --git a/config/environments/development.rb b/config/environments/development.rb index 45a8c1add3e..168c434f261 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -22,6 +22,9 @@ Rails.application.configure do # Only use best-standards-support built into browsers config.action_dispatch.best_standards_support = :builtin + # Enable webpack dev server + config.webpack.dev_server.enabled = true + # Do not compress assets config.assets.compress = false |