Merge branch 'use-common-vue-for-filtered-search' into 'master'
Ensure filtered_search utilizes common_vue bundle See merge request !11273
This commit is contained in:
commit
ea5d43a3b8
4 changed files with 8 additions and 5 deletions
|
@ -3,9 +3,9 @@
|
|||
- page_title "Boards"
|
||||
|
||||
- content_for :page_specific_javascripts do
|
||||
= page_specific_javascript_bundle_tag('common_vue')
|
||||
= page_specific_javascript_bundle_tag('filtered_search')
|
||||
= page_specific_javascript_bundle_tag('boards')
|
||||
= webpack_bundle_tag 'common_vue'
|
||||
= webpack_bundle_tag 'filtered_search'
|
||||
= webpack_bundle_tag 'boards'
|
||||
|
||||
%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
|
||||
|
|
|
@ -7,7 +7,8 @@
|
|||
= render "projects/issues/head"
|
||||
|
||||
- content_for :page_specific_javascripts do
|
||||
= page_specific_javascript_bundle_tag('filtered_search')
|
||||
= webpack_bundle_tag 'common_vue'
|
||||
= webpack_bundle_tag 'filtered_search'
|
||||
|
||||
= content_for :meta_tags do
|
||||
= auto_discovery_link_tag(:atom, params.merge(rss_url_options), title: "#{@project.name} issues")
|
||||
|
|
|
@ -8,7 +8,8 @@
|
|||
= render 'projects/last_push'
|
||||
|
||||
- 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?
|
||||
%div{ class: container_class }
|
||||
|
|
|
@ -141,6 +141,7 @@ var config = {
|
|||
'diff_notes',
|
||||
'environments',
|
||||
'environments_folder',
|
||||
'filtered_search',
|
||||
'sidebar',
|
||||
'issue_show',
|
||||
'merge_conflicts',
|
||||
|
|
Loading…
Reference in a new issue