Merge branch 'ce-backport-11435-mr-search-by-approvers-doesn-t-use-reserved-values-for-none-and-any' into 'master'

Backport fix MR search by approvers

See merge request gitlab-org/gitlab-ce!29621

3 files changed, 5 insertions, 2 deletions

diff --git a/app/assets/javascripts/filtered_search/constants.js b/app/assets/javascripts/filtered_search/constants.js
new file mode 100644
index 00000000000..8ca0e94cfeb
--- /dev/null
+++ b/app/assets/javascripts/filtered_search/constants.js
@@ -0,0 +1,2 @@
+/* eslint-disable import/prefer-default-export */
+export const TOKEN_TYPES = ['author', 'assignee'];
diff --git a/app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js b/app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js
index 315cd6f64da..7f6457242ef 100644
--- a/app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js
+++ b/app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js
@@ -1,4 +1,4 @@
-import VisualTokenValue from 'ee_else_ce/filtered_search/visual_token_value';
+import VisualTokenValue from './visual_token_value';
 import { objectToQueryString } from '~/lib/utils/common_utils';
 import FilteredSearchContainer from './container';
 
diff --git a/app/assets/javascripts/filtered_search/visual_token_value.js b/app/assets/javascripts/filtered_search/visual_token_value.js
index a54b445fb0a..018207541b3 100644
--- a/app/assets/javascripts/filtered_search/visual_token_value.js
+++ b/app/assets/javascripts/filtered_search/visual_token_value.js
@@ -6,6 +6,7 @@ import DropdownUtils from '~/filtered_search/dropdown_utils';
 import Flash from '~/flash';
 import UsersCache from '~/lib/utils/users_cache';
 import { __ } from '~/locale';
+import { TOKEN_TYPES } from 'ee_else_ce/filtered_search/constants';
 
 export default class VisualTokenValue {
   constructor(tokenValue, tokenType) {
@@ -22,7 +23,7 @@ export default class VisualTokenValue {
 
     if (tokenType === 'label') {
       this.updateLabelTokenColor(tokenValueContainer);
-    } else if (tokenType === 'author' || tokenType === 'assignee') {
+    } else if (TOKEN_TYPES.includes(tokenType)) {
       this.updateUserTokenAppearance(tokenValueContainer, tokenValueElement);
     } else if (tokenType === 'my-reaction') {
       this.updateEmojiTokenAppearance(tokenValueContainer, tokenValueElement);