diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-05-10 15:40:48 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-05-15 17:18:10 -0500 |
| commit | d5bc8ae92f7686f1e4c6774fb3a8c96c1981a64d (patch) | |
| tree | e56af4ebfbb754e177be59648cc2310cfb5f6f20 | |
| parent | 84199f19197583da44471a6b7f91694b7f4645df (diff) | |
| download | gitlab-ce-use-common-vue-for-merge-request-widget.tar.gz | |
ensure merge-request-widget utilizes common_vue bundleuse-common-vue-for-merge-request-widget
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 3 | ||||
| -rw-r--r-- | config/webpack.config.js | 1 |
2 files changed, 3 insertions, 1 deletions
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 5d5a42512b1..e2c50538f20 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -151,6 +151,7 @@ var config = { 'schedule_form', 'schedules_index', 'sidebar', + 'vue_merge_request_widget', ], minChunks: function(module, count) { return module.resource && (/vue_shared/).test(module.resource); |