diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-09 09:08:00 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-09 09:08:00 +0000 |
| commit | aa10b541b6a3fbc7fa712abcc59d073fc8dc620a (patch) | |
| tree | cde565fd177bcfd44ea892d6ebbdfcab4fb7cd35 /app/assets/javascripts/pages/groups/merge_requests | |
| parent | a5ba0dd8c6a4221f010a1fabb50aa1239314e3ef (diff) | |
| download | gitlab-ce-aa10b541b6a3fbc7fa712abcc59d073fc8dc620a.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/pages/groups/merge_requests')
| -rw-r--r-- | app/assets/javascripts/pages/groups/merge_requests/index.js | 2 |
1 files changed, 1 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 7520cfb6da0..13c5c350c24 100644 --- a/app/assets/javascripts/pages/groups/merge_requests/index.js +++ b/app/assets/javascripts/pages/groups/merge_requests/index.js @@ -1,8 +1,8 @@ +import addExtraTokensForMergeRequests from 'ee_else_ce/filtered_search/add_extra_tokens_for_merge_requests'; import projectSelect from '~/project_select'; import initFilteredSearch from '~/pages/search/init_filtered_search'; import issuableInitBulkUpdateSidebar from '~/issuable_init_bulk_update_sidebar'; 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'; const ISSUABLE_BULK_UPDATE_PREFIX = 'merge_request_'; |