2017-09-04 10:08:05 +05:30
|
|
|
--- a/config/webpack.config.js
|
|
|
|
|
+++ b/config/webpack.config.js
|
2017-09-10 18:21:32 +05:30
|
|
|
@@ -245,6 +245,7 @@
|
2017-09-04 10:08:05 +05:30
|
|
|
|
|
|
|
|
resolve: {
|
|
|
|
|
extensions: ['.js'],
|
|
|
|
|
+ modules: ['/usr/share/gitlab/node_modules', '/usr/lib/nodejs'],
|
|
|
|
|
alias: {
|
|
|
|
|
'~': path.join(ROOT_PATH, 'app/assets/javascripts'),
|
|
|
|
|
'emojis': path.join(ROOT_PATH, 'fixtures/emojis'),
|
2017-09-15 14:00:02 +05:30
|
|
|
@@ -254,7 +255,12 @@
|
|
|
|
|
'vendor': path.join(ROOT_PATH, 'vendor/assets/javascripts'),
|
|
|
|
|
'vue$': 'vue/dist/vue.esm.js',
|
|
|
|
|
}
|
|
|
|
|
+ },
|
|
|
|
|
+
|
|
|
|
|
+ resolveLoader: {
|
|
|
|
|
+ modules: ['/usr/share/gitlab/node_modules', '/usr/lib/nodejs'],
|
|
|
|
|
}
|
|
|
|
|
+
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (IS_PRODUCTION) {
|
