summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-05-10 15:40:48 -0500
committerMike Greiling <mike@pixelcog.com>2017-05-15 17:18:10 -0500
commitd5bc8ae92f7686f1e4c6774fb3a8c96c1981a64d (patch)
treee56af4ebfbb754e177be59648cc2310cfb5f6f20 /app/views
parent84199f19197583da44471a6b7f91694b7f4645df (diff)
downloadgitlab-ce-d5bc8ae92f7686f1e4c6774fb3a8c96c1981a64d.tar.gz
ensure merge-request-widget utilizes common_vue bundleuse-common-vue-for-merge-request-widget
Diffstat (limited to 'app/views')
-rw-r--r--app/views/projects/merge_requests/_show.html.haml3
1 files changed, 2 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