Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-29 21:09:52 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-29 21:09:52 +0300
commit5c2377d19572bdaaa6026fa6be131c3649074b36 (patch)
tree04acff23fd41360701c29c8694d24e587bc7ac5a /app/assets/javascripts/gfm_auto_complete.js
parent20fda899a62cc27a4d40a168640e7e926c69eb62 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/gfm_auto_complete.js')
-rw-r--r--app/assets/javascripts/gfm_auto_complete.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/gfm_auto_complete.js b/app/assets/javascripts/gfm_auto_complete.js
index cc338237191..f998d5f1b7f 100644
--- a/app/assets/javascripts/gfm_auto_complete.js
+++ b/app/assets/javascripts/gfm_auto_complete.js
@@ -278,11 +278,13 @@ class GfmAutoComplete {
return $.fn.atwho.default.callbacks.filter(query, data, searchKey);
}
- if (command === MEMBER_COMMAND.ASSIGN || command === MEMBER_COMMAND.REASSIGN) {
+ if (command === MEMBER_COMMAND.ASSIGN) {
// Only include members which are not assigned to Issuable currently
return data.filter(
member => member.type === 'User' && !assignees.includes(member.search),
);
+ } else if (command === MEMBER_COMMAND.REASSIGN) {
+ return data.filter(member => member.type === 'User');
} else if (command === MEMBER_COMMAND.UNASSIGN) {
// Only include members which are assigned to Issuable currently
return data.filter(member => assignees.includes(member.search));