Commit 67b2f2cd authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'webpack-config-fix' into 'master'

Remove trailinng comma in webpack config

See merge request gitlab-org/gitlab-ee!5098
parents 42f550e4 ceb671b7
...@@ -45,9 +45,7 @@ function generateEntries() { ...@@ -45,9 +45,7 @@ function generateEntries() {
cwd: path.join(ROOT_PATH, 'ee/app/assets/javascripts'), cwd: path.join(ROOT_PATH, 'ee/app/assets/javascripts'),
}); });
eePageEntries.forEach(path => generateAutoEntries(path, 'ee')); eePageEntries.forEach(path => generateAutoEntries(path, 'ee'));
watchAutoEntries.concat( watchAutoEntries.concat(path.join(ROOT_PATH, 'ee/app/assets/javascripts/pages/'));
path.join(ROOT_PATH, 'ee/app/assets/javascripts/pages/'),
);
autoEntriesCount = Object.keys(autoEntries).length; autoEntriesCount = Object.keys(autoEntries).length;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment