diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-05-14 16:32:23 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-05-14 16:32:23 +0000 |
commit | f70075b6d09e8cdf0898afb3d8696b881228c363 (patch) | |
tree | aeb75e6c16dfb2644fe4482a57cc0bed4757b53f /config | |
parent | 361b2b135ff020cb628f1d0617e191a8bde620bf (diff) | |
parent | 5655ff0feeaa76524dafbac982ec96cbf18e9e20 (diff) | |
download | gitlab-ce-f70075b6d09e8cdf0898afb3d8696b881228c363.tar.gz |
Merge branch 'use-common-vue-for-pipeline-schedule-bundles' into 'master'
Ensure schedule_form and schedules_index both utilize common_vue bundle
See merge request !11274
Diffstat (limited to 'config')
-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 32064138ae4..ed71ee09963 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -142,13 +142,15 @@ var config = { 'environments', 'environments_folder', 'filtered_search', - 'sidebar', 'issue_show', 'merge_conflicts', 'notebook_viewer', 'pdf_viewer', 'pipelines', 'pipelines_graph', + 'schedule_form', + 'schedules_index', + 'sidebar', ], minChunks: function(module, count) { return module.resource && (/vue_shared/).test(module.resource); |