summaryrefslogtreecommitdiff
path: root/config/application.rb
diff options
context:
space:
mode:
Diffstat (limited to 'config/application.rb')
-rw-r--r--config/application.rb11
1 files changed, 6 insertions, 5 deletions
diff --git a/config/application.rb b/config/application.rb
index 81889561473..2e08946f35c 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -138,13 +138,14 @@ module Gitlab
# like if you have constraints or database-specific column types
# config.active_record.schema_format = :sql
- # Configure webpack
- config.webpack.config_file = "config/webpack.config.js"
- config.webpack.output_dir = "public/assets/webpack"
- config.webpack.public_path = "assets/webpack"
+ # Configure webpack TODO REMOVE
+ #config.webpack.config_file = "config/webpack.config.js"
+ #config.webpack.output_dir = "public/assets/webpack"
+ #config.webpack.public_path = "assets/webpack"
+ # TODO REMOVE
# Webpack dev server configuration is handled in initializers/static_files.rb
- config.webpack.dev_server.enabled = false
+ #config.webpack.dev_server.enabled = false
# Enable the asset pipeline
config.assets.enabled = true