diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2018-02-28 05:42:42 +0300 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2018-02-28 05:42:42 +0300 |
| commit | 4371f845649deaf6bf31f0a675b33f1d58f64de4 (patch) | |
| tree | 618c2380d57d662826e185997d4663f29ca2c0bf /config | |
| parent | 1f233e3394db1beae885959c34377aa848f46e42 (diff) | |
| parent | 7ec5d320f33d46d47a28c3ec7d755a6d42bbd08b (diff) | |
Merge branch 'remove-merge-conflicts-bundle' into 'master'
Remove merge_conflicts bundle
See merge request gitlab-org/gitlab-ce!17408
Diffstat (limited to 'config')
| -rw-r--r-- | config/webpack.config.js | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index f9c10ff5986..b01cfd6595e 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -44,13 +44,10 @@ function generateEntries() { const manualEntries = { balsamiq_viewer: './blob/balsamiq_viewer.js', - common: './commons/index.js', - common_vue: './vue_shared/vue_resource_interceptor.js', cycle_analytics: './cycle_analytics/cycle_analytics_bundle.js', environments: './environments/environments_bundle.js', filtered_search: './filtered_search/filtered_search_bundle.js', help: './help/help.js', - merge_conflicts: './merge_conflicts/merge_conflicts_bundle.js', monitoring: './monitoring/monitoring_bundle.js', mr_notes: './mr_notes/index.js', notebook_viewer: './blob/notebook_viewer.js', @@ -242,7 +239,6 @@ var config = { 'environments', 'filtered_search', 'groups', - 'merge_conflicts', 'monitoring', 'mr_notes', 'notebook_viewer', |