Commit f70075b6 authored by Filipa Lacerda's avatar Filipa Lacerda

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
parents 361b2b13 5655ff0f
- content_for :page_specific_javascripts do - 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_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) = form_errors(@schedule)
......
- content_for :page_specific_javascripts do - 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 - @no_container = true
- page_title "Pipeline Schedules" - page_title "Pipeline Schedules"
...@@ -21,4 +22,3 @@ ...@@ -21,4 +22,3 @@
- else - else
.light-well .light-well
.nothing-here-block No schedules .nothing-here-block No schedules
...@@ -142,13 +142,15 @@ var config = { ...@@ -142,13 +142,15 @@ var config = {
'environments', 'environments',
'environments_folder', 'environments_folder',
'filtered_search', 'filtered_search',
'sidebar',
'issue_show', 'issue_show',
'merge_conflicts', 'merge_conflicts',
'notebook_viewer', 'notebook_viewer',
'pdf_viewer', 'pdf_viewer',
'pipelines', 'pipelines',
'pipelines_graph', 'pipelines_graph',
'schedule_form',
'schedules_index',
'sidebar',
], ],
minChunks: function(module, count) { minChunks: function(module, count) {
return module.resource && (/vue_shared/).test(module.resource); return module.resource && (/vue_shared/).test(module.resource);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment