diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 10:34:06 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 10:34:06 +0000 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /app/assets/javascripts/sidebar/components/assignees/assignees.vue | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) | |
download | gitlab-ce-859a6fb938bb9ee2a317c46dfa4fcc1af49608f0.tar.gz |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'app/assets/javascripts/sidebar/components/assignees/assignees.vue')
-rw-r--r-- | app/assets/javascripts/sidebar/components/assignees/assignees.vue | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/app/assets/javascripts/sidebar/components/assignees/assignees.vue b/app/assets/javascripts/sidebar/components/assignees/assignees.vue index 84e7110e2b2..c3c009e680a 100644 --- a/app/assets/javascripts/sidebar/components/assignees/assignees.vue +++ b/app/assets/javascripts/sidebar/components/assignees/assignees.vue @@ -11,10 +11,6 @@ export default { UncollapsedAssigneeList, }, props: { - rootPath: { - type: String, - required: true, - }, users: { type: Array, required: true, @@ -36,7 +32,6 @@ export default { sortedAssigness() { const canMergeUsers = this.users.filter((user) => user.can_merge); const canNotMergeUsers = this.users.filter((user) => !user.can_merge); - return [...canMergeUsers, ...canNotMergeUsers]; }, }, @@ -52,9 +47,9 @@ export default { <div> <collapsed-assignee-list :users="sortedAssigness" :issuable-type="issuableType" /> - <div class="value hide-collapsed"> + <div data-testid="expanded-assignee" class="value hide-collapsed"> <template v-if="hasNoUsers"> - <span class="assign-yourself no-value qa-assign-yourself"> + <span class="assign-yourself no-value"> {{ __('None') }} <template v-if="editable"> - @@ -65,12 +60,7 @@ export default { </span> </template> - <uncollapsed-assignee-list - v-else - :users="sortedAssigness" - :root-path="rootPath" - :issuable-type="issuableType" - /> + <uncollapsed-assignee-list v-else :users="sortedAssigness" :issuable-type="issuableType" /> </div> </div> </template> |