diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2018-02-23 19:40:23 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2018-02-23 19:40:23 +0000 |
| commit | 132452a6c17704159a0f99fc04b290a3fc1e2f59 (patch) | |
| tree | a9c550b1eba01e05c8683f94d4e09354f3f7fe48 /config | |
| parent | 565e4ee5a6566057ee524963565f045bd1b2c51a (diff) | |
| parent | f5b8417faa1325450cb0b65e85b15789a542b5da (diff) | |
| download | gitlab-ce-132452a6c17704159a0f99fc04b290a3fc1e2f59.tar.gz | |
Merge branch 'reduce-webpack-merge-conflicts' into 'master'
Reduce webpack merge conflicts
See merge request gitlab-org/gitlab-ce!17328
Diffstat (limited to 'config')
| -rw-r--r-- | config/webpack.config.js | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index c22ad5939f9..9db6ecd27af 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -53,8 +53,6 @@ var config = { balsamiq_viewer: './blob/balsamiq_viewer.js', blob: './blob_edit/blob_bundle.js', boards: './boards/boards_bundle.js', - common: './commons/index.js', - common_vue: './vue_shared/vue_resource_interceptor.js', cycle_analytics: './cycle_analytics/cycle_analytics_bundle.js', commit_pipelines: './commit/pipelines/pipelines_bundle.js', deploy_keys: './deploy_keys/index.js', @@ -63,8 +61,6 @@ var config = { environments_folder: './environments/folder/environments_folder_bundle.js', filtered_search: './filtered_search/filtered_search_bundle.js', help: './help/help.js', - locale: './locale/index.js', - main: './main.js', merge_conflicts: './merge_conflicts/merge_conflicts_bundle.js', monitoring: './monitoring/monitoring_bundle.js', network: './network/network_bundle.js', @@ -77,18 +73,24 @@ var config = { protected_branches: './protected_branches', protected_tags: './protected_tags', registry_list: './registry/index.js', - ide: './ide/index.js', sidebar: './sidebar/sidebar_bundle.js', snippet: './snippet/snippet_bundle.js', sketch_viewer: './blob/sketch_viewer.js', stl_viewer: './blob/stl_viewer.js', terminal: './terminal/terminal_bundle.js', - u2f: ['vendor/u2f'], ui_development_kit: './ui_development_kit.js', - raven: './raven/index.js', vue_merge_request_widget: './vue_merge_request_widget/index.js', - test: './test.js', two_factor_auth: './two_factor_auth.js', + + + common: './commons/index.js', + common_vue: './vue_shared/vue_resource_interceptor.js', + locale: './locale/index.js', + main: './main.js', + ide: './ide/index.js', + raven: './raven/index.js', + test: './test.js', + u2f: ['vendor/u2f'], webpack_runtime: './webpack.js', }, |