Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 1 deletions

diff --git a/app/assets/javascripts/search/index.js b/app/assets/javascripts/search/index.js
index 7d175bace4f..275d6351adc 100644
--- a/app/assets/javascripts/search/index.js
+++ b/app/assets/javascripts/search/index.js
@@ -1,11 +1,17 @@
 import { queryToObject } from '~/lib/utils/url_utility';
 import createStore from './store';
 import initDropdownFilters from './dropdown_filter';
+import { initSidebar } from './sidebar';
 import initGroupFilter from './group_filter';
 
 export default () => {
   const store = createStore({ query: queryToObject(window.location.search) });
 
-  initDropdownFilters(store);
+  if (gon.features.searchFacets) {
+    initSidebar(store);
+  } else {
+    initDropdownFilters(store);
+  }
+
   initGroupFilter(store);
 };