Commit cd17f804 authored by Mike Greiling's avatar Mike Greiling

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

Rename TOKEN_TYPES to USER_TOKEN_TYPES

See merge request gitlab-org/gitlab-ce!29785
parents 29883453 d5ff5410
/* eslint-disable import/prefer-default-export */ /* eslint-disable import/prefer-default-export */
export const TOKEN_TYPES = ['author', 'assignee']; export const USER_TOKEN_TYPES = ['author', 'assignee'];
...@@ -6,7 +6,7 @@ import DropdownUtils from '~/filtered_search/dropdown_utils'; ...@@ -6,7 +6,7 @@ import DropdownUtils from '~/filtered_search/dropdown_utils';
import Flash from '~/flash'; import Flash from '~/flash';
import UsersCache from '~/lib/utils/users_cache'; import UsersCache from '~/lib/utils/users_cache';
import { __ } from '~/locale'; 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 { export default class VisualTokenValue {
constructor(tokenValue, tokenType) { constructor(tokenValue, tokenType) {
...@@ -23,7 +23,7 @@ export default class VisualTokenValue { ...@@ -23,7 +23,7 @@ export default class VisualTokenValue {
if (tokenType === 'label') { if (tokenType === 'label') {
this.updateLabelTokenColor(tokenValueContainer); this.updateLabelTokenColor(tokenValueContainer);
} else if (TOKEN_TYPES.includes(tokenType)) { } else if (USER_TOKEN_TYPES.includes(tokenType)) {
this.updateUserTokenAppearance(tokenValueContainer, tokenValueElement); this.updateUserTokenAppearance(tokenValueContainer, tokenValueElement);
} else if (tokenType === 'my-reaction') { } else if (tokenType === 'my-reaction') {
this.updateEmojiTokenAppearance(tokenValueContainer, tokenValueElement); this.updateEmojiTokenAppearance(tokenValueContainer, tokenValueElement);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment