Commit a85912be authored by Fatih Acet's avatar Fatih Acet

Merge branch 'use-common-vue-for-merge-request-widget-ee' into 'master'

Port common_vue config changes to EE

See merge request !1909
parents 85c95ece e269c3c2
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
- page_title "Boards" - page_title "Boards"
- content_for :page_specific_javascripts do - content_for :page_specific_javascripts do
= page_specific_javascript_bundle_tag('common_vue') = webpack_bundle_tag 'common_vue'
= page_specific_javascript_bundle_tag('filtered_search') = webpack_bundle_tag 'filtered_search'
= page_specific_javascript_bundle_tag('boards') = webpack_bundle_tag 'boards'
%script#js-board-template{ type: "text/x-template" }= render "projects/boards/components/board" %script#js-board-template{ type: "text/x-template" }= render "projects/boards/components/board"
%script#js-board-modal-filter{ type: "text/x-template" }= render "shared/issuable/search_bar", type: :boards_modal %script#js-board-modal-filter{ type: "text/x-template" }= render "shared/issuable/search_bar", type: :boards_modal
......
...@@ -7,8 +7,9 @@ ...@@ -7,8 +7,9 @@
= render "projects/issues/head" = render "projects/issues/head"
- content_for :page_specific_javascripts do - content_for :page_specific_javascripts do
= page_specific_javascript_bundle_tag('filtered_search') = webpack_bundle_tag 'common_vue'
= page_specific_javascript_bundle_tag('issues') = webpack_bundle_tag 'filtered_search'
= webpack_bundle_tag 'issues'
= content_for :meta_tags do = content_for :meta_tags do
= auto_discovery_link_tag(:atom, params.merge(rss_url_options), title: "#{@project.name} issues") = auto_discovery_link_tag(:atom, params.merge(rss_url_options), title: "#{@project.name} issues")
......
...@@ -27,7 +27,8 @@ ...@@ -27,7 +27,8 @@
#js-vue-mr-widget.mr-widget #js-vue-mr-widget.mr-widget
- content_for :page_specific_javascripts do - 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 .content-block.content-block-small.emoji-list-container
= render 'award_emoji/awards_block', awardable: @merge_request, inline: true = render 'award_emoji/awards_block', awardable: @merge_request, inline: true
......
...@@ -8,7 +8,8 @@ ...@@ -8,7 +8,8 @@
= render 'projects/last_push' = render 'projects/last_push'
- content_for :page_specific_javascripts do - content_for :page_specific_javascripts do
= page_specific_javascript_bundle_tag('filtered_search') = webpack_bundle_tag 'common_vue'
= webpack_bundle_tag 'filtered_search'
- if @project.merge_requests.exists? - if @project.merge_requests.exists?
%div{ class: container_class } %div{ class: container_class }
......
...@@ -140,14 +140,17 @@ var config = { ...@@ -140,14 +140,17 @@ var config = {
'diff_notes', 'diff_notes',
'environments', 'environments',
'environments_folder', 'environments_folder',
'sidebar', 'filtered_search',
'issue_show', 'issue_show',
'merge_conflicts', 'merge_conflicts',
'notebook_viewer', 'notebook_viewer',
'pdf_viewer', 'pdf_viewer',
'pipelines', 'pipelines',
'mr_widget_ee', 'pipelines_graph',
'issue_show' 'schedule_form',
'schedules_index',
'sidebar',
'vue_merge_request_widget',
], ],
minChunks: function(module, count) { minChunks: function(module, count) {
return module.resource && (/vue_shared/).test(module.resource); return module.resource && (/vue_shared/).test(module.resource);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment