summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-05-25 16:22:29 +0000
committerPhil Hughes <me@iamphill.com>2017-05-25 16:22:29 +0000
commitd70f7f5d25aa8753ee3fa26a7564b7d379e72c2d (patch)
tree341cd572c6be02f28645d5491b76c2ad577cd4bb /app
parent0fccbdbc69121957c020eb8a56e4decb62ace596 (diff)
parent56797a84c82b673d15cbfa6825e65c63e8d1636e (diff)
downloadgitlab-ce-d70f7f5d25aa8753ee3fa26a7564b7d379e72c2d.tar.gz
Merge branch 'fix-filtered-search-issuable-empty-state-exception' into 'master'
Fix filtered search issuable empty state exception Closes #31455 See merge request !11347
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/dispatcher.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js
index 2090a7e12d6..c5fffea8bb0 100644
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -123,7 +123,7 @@ import ShortcutsBlob from './shortcuts_blob';
break;
case 'projects:merge_requests:index':
case 'projects:issues:index':
- if (gl.FilteredSearchManager) {
+ if (gl.FilteredSearchManager && document.querySelector('.filtered-search')) {
new gl.FilteredSearchManager(page === 'projects:issues:index' ? 'issues' : 'merge_requests');
}
Issuable.init();