diff options
| author | Simon Knox <psimyn@gmail.com> | 2017-09-06 14:35:58 +1000 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2017-09-06 14:35:58 +1000 |
| commit | b9aa55e1ea2ba226bd9bf4c6fb08fdec30e046c5 (patch) | |
| tree | b7770180f178086c78ef2ca25d6bb2267f739110 /config/webpack.config.js | |
| parent | 74740604211dab6632771f1bfd7dd67902fea7ef (diff) | |
| parent | d68ff7f50a93ebbff537b5e795cf6bf80bd66a6e (diff) | |
| download | gitlab-ce-b9aa55e1ea2ba226bd9bf4c6fb08fdec30e046c5.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ee_issue_928_backport
Diffstat (limited to 'config/webpack.config.js')
| -rw-r--r-- | config/webpack.config.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index 7d63a42d7d8..6b0cd023291 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -30,7 +30,7 @@ var config = { blob: './blob_edit/blob_bundle.js', boards: './boards/boards_bundle.js', common: './commons/index.js', - common_vue: ['vue', './vue_shared/common_vue.js'], + common_vue: './vue_shared/vue_resource_interceptor.js', common_d3: ['d3'], cycle_analytics: './cycle_analytics/cycle_analytics_bundle.js', commit_pipelines: './commit/pipelines/pipelines_bundle.js', @@ -55,6 +55,7 @@ var config = { monitoring: './monitoring/monitoring_bundle.js', network: './network/network_bundle.js', notebook_viewer: './blob/notebook_viewer.js', + notes: './notes/index.js', pdf_viewer: './blob/pdf_viewer.js', pipelines: './pipelines/pipelines_bundle.js', pipelines_charts: './pipelines/pipelines_charts.js', @@ -194,6 +195,7 @@ var config = { 'merge_conflicts', 'monitoring', 'notebook_viewer', + 'notes', 'pdf_viewer', 'pipelines', 'pipelines_details', |