Merge branch '9-2-stable-fix-conflicts-for-mr-11274' into '9-2-stable'

Fix 9.2 conflicts for "Ensure schedule_form and schedules_index both utilize common_vue bundle"

See merge request !11488

4 files changed, 10 insertions, 5 deletions

diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index b7515e1d91f..75120409bb3 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -21,7 +21,8 @@
     #js-vue-mr-widget.mr-widget
 
     - content_for :page_specific_javascripts do
-      = page_specific_javascript_bundle_tag('vue_merge_request_widget')
+      = webpack_bundle_tag 'common_vue'
+      = webpack_bundle_tag 'vue_merge_request_widget'
 
     .content-block.content-block-small.emoji-list-container
       = render 'award_emoji/awards_block', awardable: @merge_request, inline: true
diff --git a/app/views/projects/pipeline_schedules/_form.html.haml b/app/views/projects/pipeline_schedules/_form.html.haml
index 4a21cce024e..1de9610c17e 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 dd35c3055f2..a2f3ee31d3d 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 cb0ccdab74a..75bc3c5fdbb 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -142,7 +142,6 @@ var config = {
         'environments',
         'environments_folder',
         'filtered_search',
-        'sidebar',
         'issue_show',
         'merge_conflicts',
         'notebook_viewer',
@@ -150,6 +149,10 @@ var config = {
         'pipelines',
         'balsamiq_viewer',
         'pipelines_graph',
+        'schedule_form',
+        'schedules_index',
+        'sidebar',
+        'vue_merge_request_widget',
       ],
       minChunks: function(module, count) {
         return module.resource && (/vue_shared/).test(module.resource);