Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
a47fb242
Commit
a47fb242
authored
Jun 18, 2019
by
Arun Kumar Mohan
Committed by
Mike Greiling
Jun 18, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename TOKEN_TYPES to USER_TOKEN_TYPES
parent
5bff14ff
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
5 deletions
+10
-5
app/assets/javascripts/filtered_search/constants.js
app/assets/javascripts/filtered_search/constants.js
+1
-1
app/assets/javascripts/filtered_search/visual_token_value.js
app/assets/javascripts/filtered_search/visual_token_value.js
+2
-2
ee/app/assets/javascripts/filtered_search/constants.js
ee/app/assets/javascripts/filtered_search/constants.js
+2
-2
ee/changelogs/unreleased/chore-rename-variable.yml
ee/changelogs/unreleased/chore-rename-variable.yml
+5
-0
No files found.
app/assets/javascripts/filtered_search/constants.js
View file @
a47fb242
/* eslint-disable import/prefer-default-export */
export
const
TOKEN_TYPES
=
[
'
author
'
,
'
assignee
'
];
export
const
USER_
TOKEN_TYPES
=
[
'
author
'
,
'
assignee
'
];
app/assets/javascripts/filtered_search/visual_token_value.js
View file @
a47fb242
...
...
@@ -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
);
...
...
ee/app/assets/javascripts/filtered_search/constants.js
View file @
a47fb242
/* eslint-disable import/prefer-default-export */
import
{
TOKEN_TYPES
as
CE
_TOKEN_TYPES
}
from
'
~/filtered_search/constants
'
;
import
{
USER_TOKEN_TYPES
as
CE_USER
_TOKEN_TYPES
}
from
'
~/filtered_search/constants
'
;
export
const
TOKEN_TYPES
=
[...
CE
_TOKEN_TYPES
,
'
approver
'
];
export
const
USER_TOKEN_TYPES
=
[...
CE_USER
_TOKEN_TYPES
,
'
approver
'
];
ee/changelogs/unreleased/chore-rename-variable.yml
0 → 100644
View file @
a47fb242
---
title
:
Rename `TOKEN_TYPES` to `USER_TOKEN_TYPES`
merge_request
:
14209
author
:
Arun Kumar Mohan
type
:
other
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment