diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-05-16 20:09:14 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2017-05-16 20:09:14 +0000 |
| commit | 1142d6ba482223f01aa89a523ad3769411807e69 (patch) | |
| tree | 07b44892f8626e1b0318dd63aaca8dba5b65da5f /app/views | |
| parent | 10a9ba3a1cd35c42b088ba5814ec35beb0e989fc (diff) | |
| parent | d5bc8ae92f7686f1e4c6774fb3a8c96c1981a64d (diff) | |
| download | gitlab-ce-1142d6ba482223f01aa89a523ad3769411807e69.tar.gz | |
Merge branch 'use-common-vue-for-merge-request-widget' into 'master'
Ensure vue_merge_request_widget utilizes common_vue bundle
See merge request !11269
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 3 |
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 b7515e1d91f..75120409bb3 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 |