Merge branch 'use-common-vue-for-merge-request-widget' into 'master'

Ensure vue_merge_request_widget utilizes common_vue bundle

See merge request !11269
This commit is contained in:
Fatih Acet 2017-05-16 20:09:14 +00:00
commit 1142d6ba48
2 changed files with 3 additions and 1 deletions

View File

@ -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

View File

@ -152,6 +152,7 @@ var config = {
'schedule_form',
'schedules_index',
'sidebar',
'vue_merge_request_widget',
],
minChunks: function(module, count) {
return module.resource && (/vue_shared/).test(module.resource);