diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-14 18:09:40 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-14 18:09:40 +0300 |
commit | fde3e0435c496af7dc37527f465573abd5657f5a (patch) | |
tree | 378395c009c4e9b40c3c509189531511494539e5 /app/assets/javascripts/filtered_search | |
parent | 95671fac6e66cd23da4669706a619c1139eb1f14 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/filtered_search')
-rw-r--r-- | app/assets/javascripts/filtered_search/add_extra_tokens_for_merge_requests.js | 12 | ||||
-rw-r--r-- | app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js | 9 |
2 files changed, 12 insertions, 9 deletions
diff --git a/app/assets/javascripts/filtered_search/add_extra_tokens_for_merge_requests.js b/app/assets/javascripts/filtered_search/add_extra_tokens_for_merge_requests.js index 8899870be79..38a5bdd4a71 100644 --- a/app/assets/javascripts/filtered_search/add_extra_tokens_for_merge_requests.js +++ b/app/assets/javascripts/filtered_search/add_extra_tokens_for_merge_requests.js @@ -1,6 +1,18 @@ import { __ } from '~/locale'; export default (IssuableTokenKeys, disableTargetBranchFilter = false) => { + const reviewerToken = { + formattedKey: __('Reviewer'), + key: 'reviewer', + type: 'string', + param: 'username', + symbol: '@', + icon: 'user', + tag: '@reviewer', + }; + IssuableTokenKeys.tokenKeys.splice(2, 0, reviewerToken); + IssuableTokenKeys.tokenKeysWithAlternative.splice(2, 0, reviewerToken); + const draftToken = { token: { formattedKey: __('Draft'), diff --git a/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js b/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js index 6e742e4ca02..f9388e9c5d8 100644 --- a/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js +++ b/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js @@ -22,15 +22,6 @@ export const tokenKeys = [ tag: '@assignee', }, { - formattedKey: __('Reviewer'), - key: 'reviewer', - type: 'string', - param: 'username', - symbol: '@', - icon: 'user', - tag: '@reviewer', - }, - { formattedKey: __('Milestone'), key: 'milestone', type: 'string', |