Skip to content
Snippets Groups Projects
Commit 5fdaf78a authored by Clement Ho's avatar Clement Ho
Browse files

Merge branch 'use-common-vue-for-filtered-search' into 'master'

Ensure filtered_search utilizes common_vue bundle

See merge request !11273

Former-commit-id: ea5d43a3
parents 0c147dd7 65dc005f
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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
Loading
Loading
Loading
Loading
@@ -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")
Loading
Loading
Loading
Loading
@@ -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 }
Loading
Loading
Loading
Loading
@@ -141,6 +141,7 @@ var config = {
'diff_notes',
'environments',
'environments_folder',
'filtered_search',
'sidebar',
'issue_show',
'merge_conflicts',
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment