diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-05-16 20:09:14 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-05-18 11:18:25 -0500 |
| commit | 622c71ef370ecd8435d0d4ea7093094e594dce1e (patch) | |
| tree | 6ae1e6767681115e1f8f420edc04a390f8991875 | |
| parent | fb6aeee2ecec8621314db5b22a1b3c715ecb8a99 (diff) | |
| download | gitlab-ce-9-2-stable-fix-conflicts-for-mr-11274.tar.gz | |
Merge branch 'use-common-vue-for-merge-request-widget' into 'master'9-2-stable-fix-conflicts-for-mr-11274
Ensure vue_merge_request_widget utilizes common_vue bundle
See merge request !11269
| -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 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); |