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

3 files changed, 7 insertions, 4 deletions

diff --git a/app/views/projects/pipeline_schedules/_form.html.haml b/app/views/projects/pipeline_schedules/_form.html.haml
index 2d272a93b98..d6f4f1a206c 100644
--- a/app/views/projects/pipeline_schedules/_form.html.haml
+++ b/app/views/projects/pipeline_schedules/_form.html.haml
@@ -1,5 +1,6 @@
 - content_for :page_specific_javascripts do
-  = page_specific_javascript_bundle_tag('schedule_form')
+  = webpack_bundle_tag 'common_vue'
+  = webpack_bundle_tag 'schedule_form'
 
 = form_for [@project.namespace.becomes(Namespace), @project, @schedule], as: :schedule, html: { id: "new-pipeline-schedule-form", class: "form-horizontal js-pipeline-schedule-form" } do |f|
   = form_errors(@schedule)
diff --git a/app/views/projects/pipeline_schedules/index.html.haml b/app/views/projects/pipeline_schedules/index.html.haml
index a597d745e33..25c52175e3d 100644
--- a/app/views/projects/pipeline_schedules/index.html.haml
+++ b/app/views/projects/pipeline_schedules/index.html.haml
@@ -1,5 +1,6 @@
 - content_for :page_specific_javascripts do
-  = page_specific_javascript_bundle_tag('schedules_index')
+  = webpack_bundle_tag 'common_vue'
+  = webpack_bundle_tag 'schedules_index'
 
 - @no_container = true
 - page_title "Pipeline Schedules"
@@ -21,4 +22,3 @@
   - else
     .light-well
       .nothing-here-block No schedules
-
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);