Merge branch 'chore/rename-variable-ce' into 'master'

Rename TOKEN_TYPES to USER_TOKEN_TYPES

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

2 files changed, 3 insertions, 3 deletions

diff --git a/app/assets/javascripts/filtered_search/constants.js b/app/assets/javascripts/filtered_search/constants.js
index 8ca0e94cfeb..b11111f1081 100644
--- a/app/assets/javascripts/filtered_search/constants.js
+++ b/app/assets/javascripts/filtered_search/constants.js
@@ -1,2 +1,2 @@
 /* eslint-disable import/prefer-default-export */
-export const TOKEN_TYPES = ['author', 'assignee'];
+export const USER_TOKEN_TYPES = ['author', 'assignee'];
diff --git a/app/assets/javascripts/filtered_search/visual_token_value.js b/app/assets/javascripts/filtered_search/visual_token_value.js
index 018207541b3..ea58dbd3fa9 100644
--- a/app/assets/javascripts/filtered_search/visual_token_value.js
+++ b/app/assets/javascripts/filtered_search/visual_token_value.js
@@ -6,7 +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';
+import { USER_TOKEN_TYPES } from 'ee_else_ce/filtered_search/constants';
 
 export default class VisualTokenValue {
   constructor(tokenValue, tokenType) {
@@ -23,7 +23,7 @@ export default class VisualTokenValue {
 
     if (tokenType === 'label') {
       this.updateLabelTokenColor(tokenValueContainer);
-    } else if (TOKEN_TYPES.includes(tokenType)) {
+    } else if (USER_TOKEN_TYPES.includes(tokenType)) {
       this.updateUserTokenAppearance(tokenValueContainer, tokenValueElement);
     } else if (tokenType === 'my-reaction') {
       this.updateEmojiTokenAppearance(tokenValueContainer, tokenValueElement);