diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-06 00:08:46 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-06 00:08:46 +0300 |
commit | 6cdb39a9ef2d9a3008ce2b4aeb5dacb86e0a1c2b (patch) | |
tree | 46a8685ab2511e6eaf06d2d751617b71c52e78a5 /app/assets/javascripts/sidebar | |
parent | bc3187f6d968f954c7998b66a6595273f9ecf5e1 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/sidebar')
-rw-r--r-- | app/assets/javascripts/sidebar/components/assignees/uncollapsed_assignee_list.vue | 8 | ||||
-rw-r--r-- | app/assets/javascripts/sidebar/components/reviewers/uncollapsed_reviewer_list.vue | 13 |
2 files changed, 14 insertions, 7 deletions
diff --git a/app/assets/javascripts/sidebar/components/assignees/uncollapsed_assignee_list.vue b/app/assets/javascripts/sidebar/components/assignees/uncollapsed_assignee_list.vue index 650f6858c0d..8717d205dcb 100644 --- a/app/assets/javascripts/sidebar/components/assignees/uncollapsed_assignee_list.vue +++ b/app/assets/javascripts/sidebar/components/assignees/uncollapsed_assignee_list.vue @@ -113,13 +113,14 @@ export default { 'gl-display-grid gl-align-items-center': showVerticalList, 'gl-mb-3': index !== users.length - 1 && showVerticalList, }" - class="assignee-attention-grid" + class="assignee-grid" > <assignee-avatar-link :user="user" :issuable-type="issuableType" :tooltip-has-name="!showVerticalList" - class="gl-grid-column-2 gl-grid-row-1 gl-word-break-word" + class="gl-word-break-word" + data-css-area="user" > <div v-if="showVerticalList" @@ -134,7 +135,8 @@ export default { v-if="showVerticalList" :user="user" type="assignee" - class="gl-grid-column-1 gl-grid-row-1 gl-mr-2" + class="gl-mr-2" + data-css-area="attention" @toggle-attention-requested="toggleAttentionRequested" /> </div> diff --git a/app/assets/javascripts/sidebar/components/reviewers/uncollapsed_reviewer_list.vue b/app/assets/javascripts/sidebar/components/reviewers/uncollapsed_reviewer_list.vue index ef44317b3c0..3e6be3487b1 100644 --- a/app/assets/javascripts/sidebar/components/reviewers/uncollapsed_reviewer_list.vue +++ b/app/assets/javascripts/sidebar/components/reviewers/uncollapsed_reviewer_list.vue @@ -94,15 +94,19 @@ export default { <div v-for="(user, index) in users" :key="user.id" - :class="{ 'gl-mb-3': index !== users.length - 1 }" - class="gl-display-grid gl-align-items-center reviewer-attention-grid" + :class="{ + 'gl-mb-3': index !== users.length - 1, + 'attention-requests': glFeatures.mrAttentionRequests, + }" + class="gl-display-grid gl-align-items-center reviewer-grid" data-testid="reviewer" > <reviewer-avatar-link :user="user" :root-path="rootPath" :issuable-type="issuableType" - class="gl-grid-column-2 gl-grid-row-1 gl-word-break-word gl-mr-2" + class="gl-word-break-word gl-mr-2" + data-css-area="user" > <div class="gl-ml-3 gl-line-height-normal gl-display-grid"> <span>{{ user.name }}</span> @@ -113,7 +117,8 @@ export default { v-if="glFeatures.mrAttentionRequests" :user="user" type="reviewer" - class="gl-grid-column-1 gl-grid-row-1 gl-mr-2" + class="gl-mr-2" + data-css-area="attention" @toggle-attention-requested="toggleAttentionRequested" /> <gl-icon |