diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-07-28 15:26:00 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-07-28 15:26:00 +0100 |
| commit | dc04fdc1a3165134fc9245e9a591daceee857ef4 (patch) | |
| tree | e3b01475f2e224cd1595167c9a5dd0d0dc013a89 /config/webpack.config.js | |
| parent | ec302c6c0cf7d4b3a19bea43ce380dbaa60b363d (diff) | |
| parent | 48c51e207e4cba8a69e4ca65cba1e169d384cefa (diff) | |
| download | gitlab-ce-dc04fdc1a3165134fc9245e9a591daceee857ef4.tar.gz | |
Merge remote-tracking branch 'origin/master' into ide
Diffstat (limited to 'config/webpack.config.js')
| -rw-r--r-- | config/webpack.config.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index 6682421742f..9e6fd8aebe6 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -43,6 +43,7 @@ var config = { group: './group.js', groups: './groups/index.js', groups_list: './groups_list.js', + how_to_merge: './how_to_merge.js', issue_show: './issue_show/index.js', integrations: './integrations', job_details: './jobs/job_details_bundle.js', @@ -57,7 +58,7 @@ var config = { pipelines_details: './pipelines/pipeline_details_bundle.js', profile: './profile/profile_bundle.js', prometheus_metrics: './prometheus_metrics', - protected_branches: './protected_branches/protected_branches_bundle.js', + protected_branches: './protected_branches', protected_tags: './protected_tags', repo: './repo/index.js', sidebar: './sidebar/sidebar_bundle.js', @@ -68,7 +69,6 @@ var config = { stl_viewer: './blob/stl_viewer.js', terminal: './terminal/terminal_bundle.js', u2f: ['vendor/u2f'], - users: './users/index.js', raven: './raven/index.js', vue_merge_request_widget: './vue_merge_request_widget/index.js', test: './test.js', @@ -196,7 +196,6 @@ var config = { name: 'common_d3', chunks: [ 'graphs', - 'users', 'monitoring', ], }), |