summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/pages/projects/merge_requests
diff options
context:
space:
mode:
authorIgor <idrozdov@gitlab.com>2019-03-07 23:55:45 +0000
committerMike Greiling <mike@pixelcog.com>2019-03-07 23:55:45 +0000
commit9745d0de2ff605a03e7fbb95d0f71279bbd4afa5 (patch)
tree0d7f0f89b51199bf676988888539338086f419a3 /app/assets/javascripts/pages/projects/merge_requests
parent90f4b6563d42ff7412de277682c0ecb7c25e41bb (diff)
downloadgitlab-ce-9745d0de2ff605a03e7fbb95d0f71279bbd4afa5.tar.gz
Provide EE backports for filtering by approver feature
Adds custom validator for ArrayNoneAny param Extracts some logic in js into separate files
Diffstat (limited to 'app/assets/javascripts/pages/projects/merge_requests')
-rw-r--r--app/assets/javascripts/pages/projects/merge_requests/index/index.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/pages/projects/merge_requests/index/index.js b/app/assets/javascripts/pages/projects/merge_requests/index/index.js
index ec39db12e74..0bcca22e40f 100644
--- a/app/assets/javascripts/pages/projects/merge_requests/index/index.js
+++ b/app/assets/javascripts/pages/projects/merge_requests/index/index.js
@@ -2,12 +2,13 @@ import IssuableIndex from '~/issuable_index';
import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation';
import UsersSelect from '~/users_select';
import initFilteredSearch from '~/pages/search/init_filtered_search';
+import addExtraTokensForMergeRequests from 'ee_else_ce/filtered_search/add_extra_tokens_for_merge_requests';
import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys';
import { FILTERED_SEARCH } from '~/pages/constants';
import { ISSUABLE_INDEX } from '~/pages/projects/constants';
document.addEventListener('DOMContentLoaded', () => {
- IssuableFilteredSearchTokenKeys.addExtraTokensForMergeRequests();
+ addExtraTokensForMergeRequests(IssuableFilteredSearchTokenKeys);
initFilteredSearch({
page: FILTERED_SEARCH.MERGE_REQUESTS,