diff options
author | Phil Hughes <me@iamphill.com> | 2019-04-09 07:21:15 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-04-09 07:21:15 +0000 |
commit | 8b8f79440d70a8a82e7a196a30a62aaf5bac695c (patch) | |
tree | 7aa9576c1006dafeb3649638e64cb999bb8fc404 /app | |
parent | 5cc1d2f1ef2fd64662e1a1f9b72dd59b0ec98625 (diff) | |
parent | e62f9d9b2e362ef7f021f17473ac3e0dc584e221 (diff) | |
download | gitlab-ce-8b8f79440d70a8a82e7a196a30a62aaf5bac695c.tar.gz |
Merge branch 'winh-filtered_search_boards' into 'master'
Remove EE-specific changes from FilteredSearchBoards (CE-backport)
See merge request gitlab-org/gitlab-ce!27122
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/boards/filtered_search_boards.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/javascripts/boards/filtered_search_boards.js b/app/assets/javascripts/boards/filtered_search_boards.js index c14d69c5d18..6b54e8baefb 100644 --- a/app/assets/javascripts/boards/filtered_search_boards.js +++ b/app/assets/javascripts/boards/filtered_search_boards.js @@ -1,6 +1,8 @@ +import IssuableFilteredSearchTokenKeys from 'ee_else_ce/filtered_search/issuable_filtered_search_token_keys'; import FilteredSearchContainer from '../filtered_search/container'; import FilteredSearchManager from '../filtered_search/filtered_search_manager'; import boardsStore from './stores/boards_store'; +import { isEE } from '~/lib/utils/common_utils'; export default class FilteredSearchBoards extends FilteredSearchManager { constructor(store, updateUrl = false, cantEdit = []) { @@ -8,6 +10,8 @@ export default class FilteredSearchBoards extends FilteredSearchManager { page: 'boards', isGroupDecendent: true, stateFiltersSelector: '.issues-state-filters', + isGroup: isEE(), + filteredSearchTokenKeys: IssuableFilteredSearchTokenKeys, }); this.store = store; |