From 622c71ef370ecd8435d0d4ea7093094e594dce1e Mon Sep 17 00:00:00 2001 From: Fatih Acet Date: Tue, 16 May 2017 20:09:14 +0000 Subject: Merge branch 'use-common-vue-for-merge-request-widget' into 'master' Ensure vue_merge_request_widget utilizes common_vue bundle See merge request !11269 --- app/views/projects/merge_requests/_show.html.haml | 3 ++- config/webpack.config.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index 25b8567b78f..e9e8d947c42 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/config/webpack.config.js b/config/webpack.config.js index 786148ebd0e..75bc3c5fdbb 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -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); -- cgit v1.2.1