diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-05-11 17:05:54 +0000 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2017-05-18 14:40:26 +0000 |
| commit | 91b4f8e30237b252059052686375f0ef7d7ec9c7 (patch) | |
| tree | a78949c3d928aa4fe07f52f649601ecefe8e86ac | |
| parent | b6fdb7d232e2cfb725fabb62c08a92ef008f3c1b (diff) | |
| download | gitlab-ce-91b4f8e30237b252059052686375f0ef7d7ec9c7.tar.gz | |
Merge branch 'use-common-vue-for-filtered-search' into 'master'
Ensure filtered_search utilizes common_vue bundle
See merge request !11273
| -rw-r--r-- | app/views/projects/boards/_show.html.haml | 6 | ||||
| -rw-r--r-- | app/views/projects/issues/index.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/index.html.haml | 3 | ||||
| -rw-r--r-- | config/webpack.config.js | 1 |
4 files changed, 8 insertions, 5 deletions
diff --git a/app/views/projects/boards/_show.html.haml b/app/views/projects/boards/_show.html.haml index 7ca0ec8ed2b..efec69662f3 100644 --- a/app/views/projects/boards/_show.html.haml +++ b/app/views/projects/boards/_show.html.haml @@ -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 diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml index 4ac0bc1d028..60900e9d660 100644 --- a/app/views/projects/issues/index.html.haml +++ b/app/views/projects/issues/index.html.haml @@ -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") diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml index 6bf0035e051..502220232a1 100644 --- a/app/views/projects/merge_requests/index.html.haml +++ b/app/views/projects/merge_requests/index.html.haml @@ -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 } diff --git a/config/webpack.config.js b/config/webpack.config.js index 7e413c8493e..cb0ccdab74a 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -141,6 +141,7 @@ var config = { 'diff_notes', 'environments', 'environments_folder', + 'filtered_search', 'sidebar', 'issue_show', 'merge_conflicts', |