summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-02-20 21:35:49 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-02-20 21:35:49 +0000
commit86c9c93de709c9013572682b868b5e6db429dd1e (patch)
treeb677a129083e818b9342348ce52fe5a8450028a1
parentddf0d0c9d1d2e39ca64fc042a221cb02408b866a (diff)
parentd9763cb4dfb2eaf78718abc21434a3fde20a4fb6 (diff)
downloadgitlab-ce-86c9c93de709c9013572682b868b5e6db429dd1e.tar.gz
Merge branch 'issue-index-refactor' into 'master'
Refactor issue index filtered search See merge request gitlab-org/gitlab-ce!16981
-rw-r--r--app/assets/javascripts/pages/search/init_filtered_search.js11
-rw-r--r--app/views/projects/issues/index.html.haml1
2 files changed, 11 insertions, 1 deletions
diff --git a/app/assets/javascripts/pages/search/init_filtered_search.js b/app/assets/javascripts/pages/search/init_filtered_search.js
index 250f9d992ab..82ea239bcff 100644
--- a/app/assets/javascripts/pages/search/init_filtered_search.js
+++ b/app/assets/javascripts/pages/search/init_filtered_search.js
@@ -1,3 +1,14 @@
+import '~/filtered_search/dropdown_emoji';
+import '~/filtered_search/dropdown_hint';
+import '~/filtered_search/dropdown_non_user';
+import '~/filtered_search/dropdown_user';
+import '~/filtered_search/dropdown_utils';
+import '~/filtered_search/filtered_search_dropdown_manager';
+import '~/filtered_search/filtered_search_dropdown';
+import '~/filtered_search/filtered_search_manager';
+import '~/filtered_search/filtered_search_tokenizer';
+import '~/filtered_search/filtered_search_visual_tokens';
+
export default ({ page }) => {
const filteredSearchEnabled = gl.FilteredSearchManager && document.querySelector('.filtered-search');
if (filteredSearchEnabled) {
diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml
index 193111b4cee..fb06ba58c27 100644
--- a/app/views/projects/issues/index.html.haml
+++ b/app/views/projects/issues/index.html.haml
@@ -6,7 +6,6 @@
- content_for :page_specific_javascripts do
= 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")