diff options
| author | Igor <idrozdov@gitlab.com> | 2019-03-08 02:55:45 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-03-08 02:55:45 +0300 |
| commit | 9745d0de2ff605a03e7fbb95d0f71279bbd4afa5 (patch) | |
| tree | 0d7f0f89b51199bf676988888539338086f419a3 /app/assets/javascripts/pages/groups/merge_requests | |
| parent | 90f4b6563d42ff7412de277682c0ecb7c25e41bb (diff) | |
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/groups/merge_requests')
| -rw-r--r-- | app/assets/javascripts/pages/groups/merge_requests/index.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/pages/groups/merge_requests/index.js b/app/assets/javascripts/pages/groups/merge_requests/index.js index 339ce67438a..12a26fd88fa 100644 --- a/app/assets/javascripts/pages/groups/merge_requests/index.js +++ b/app/assets/javascripts/pages/groups/merge_requests/index.js @@ -1,10 +1,11 @@ import projectSelect from '~/project_select'; import initFilteredSearch from '~/pages/search/init_filtered_search'; import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys'; +import addExtraTokensForMergeRequests from 'ee_else_ce/filtered_search/add_extra_tokens_for_merge_requests'; import { FILTERED_SEARCH } from '~/pages/constants'; document.addEventListener('DOMContentLoaded', () => { - IssuableFilteredSearchTokenKeys.addExtraTokensForMergeRequests(); + addExtraTokensForMergeRequests(IssuableFilteredSearchTokenKeys); initFilteredSearch({ page: FILTERED_SEARCH.MERGE_REQUESTS, |