diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-05-16 20:09:14 +0000 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2017-05-18 14:42:38 +0000 |
| commit | a4904c97816186b1d4df3d8309a4c511850e22f1 (patch) | |
| tree | d7efef11ceb4dd05734d88af017bc6ceab7cb763 | |
| parent | 91b4f8e30237b252059052686375f0ef7d7ec9c7 (diff) | |
| download | gitlab-ce-9-2-stable-fix-conflicts-for-mr-11269.tar.gz | |
Merge branch 'use-common-vue-for-merge-request-widget' into 'master'9-2-stable-fix-conflicts-for-mr-11269
Ensure vue_merge_request_widget utilizes common_vue bundle
See merge request !11269
Conflicts:
config/webpack.config.js
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 3 | ||||
| -rw-r--r-- | config/webpack.config.js | 7 |
2 files changed, 9 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 cb0ccdab74a..f91022f9649 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -150,6 +150,13 @@ var config = { 'pipelines', 'balsamiq_viewer', 'pipelines_graph', +<<<<<<< HEAD +======= + 'schedule_form', + 'schedules_index', + 'sidebar', + 'vue_merge_request_widget', +>>>>>>> 1142d6b... Merge branch 'use-common-vue-for-merge-request-widget' into 'master'
], minChunks: function(module, count) { return module.resource && (/vue_shared/).test(module.resource); |