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
This commit is contained in:
commit
f70075b6d0
3 changed files with 7 additions and 4 deletions
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue