Add latest changes from gitlab-org/gitlab@master

4 files changed, 11 insertions, 13 deletions

diff --git a/app/assets/javascripts/sidebar/components/assignees/assignee_avatar_link.vue b/app/assets/javascripts/sidebar/components/assignees/assignee_avatar_link.vue
index 578c344da02..ef40de82d01 100644
--- a/app/assets/javascripts/sidebar/components/assignees/assignee_avatar_link.vue
+++ b/app/assets/javascripts/sidebar/components/assignees/assignee_avatar_link.vue
@@ -101,14 +101,15 @@ export default {
 <template>
   <!-- must be `d-inline-block` or parent flex-basis causes width issues -->
   <gl-link
-    v-gl-tooltip="tooltipOption"
     :href="assigneeUrl"
     :title="tooltipTitle"
-    class="gl-display-inline-block"
+    :data-user-id="user.id"
+    data-placement="left"
+    class="gl-display-inline-block js-user-link"
   >
     <!-- use d-flex so that slot can be appropriately styled -->
     <span class="gl-display-flex">
-      <assignee-avatar :user="user" :img-size="32" :issuable-type="issuableType" />
+      <assignee-avatar :user="user" :img-size="24" :issuable-type="issuableType" />
       <slot></slot>
     </span>
   </gl-link>
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 8717d205dcb..293de444c0a 100644
--- a/app/assets/javascripts/sidebar/components/assignees/uncollapsed_assignee_list.vue
+++ b/app/assets/javascripts/sidebar/components/assignees/uncollapsed_assignee_list.vue
@@ -124,11 +124,10 @@ export default {
         >
           <div
             v-if="showVerticalList"
-            class="gl-ml-3 gl-line-height-normal gl-display-grid"
+            class="gl-ml-3 gl-line-height-normal gl-display-grid gl-align-items-center"
             data-testid="username"
           >
             <user-name-with-status :name="user.name" :availability="userAvailability(user)" />
-            <span>@{{ user.username }}</span>
           </div>
         </assignee-avatar-link>
         <attention-requested-toggle
diff --git a/app/assets/javascripts/sidebar/components/reviewers/reviewer_avatar_link.vue b/app/assets/javascripts/sidebar/components/reviewers/reviewer_avatar_link.vue
index a11468c8761..36a08482e69 100644
--- a/app/assets/javascripts/sidebar/components/reviewers/reviewer_avatar_link.vue
+++ b/app/assets/javascripts/sidebar/components/reviewers/reviewer_avatar_link.vue
@@ -47,8 +47,6 @@ export default {
         return sprintf(__('%{userName} (cannot merge)'), { userName: this.user.name });
       } else if (this.cannotMerge) {
         return __('Cannot merge');
-      } else if (this.tooltipHasName) {
-        return this.user.name;
       }
 
       return '';
@@ -70,14 +68,15 @@ export default {
 <template>
   <!-- must be `d-inline-block` or parent flex-basis causes width issues -->
   <gl-link
-    v-gl-tooltip="tooltipOption"
     :href="reviewerUrl"
     :title="tooltipTitle"
-    class="gl-display-inline-block"
+    :data-user-id="user.id"
+    data-placement="left"
+    class="gl-display-inline-block js-user-link"
   >
     <!-- use d-flex so that slot can be appropriately styled -->
     <span class="gl-display-flex">
-      <reviewer-avatar :user="user" :img-size="32" :issuable-type="issuableType" />
+      <reviewer-avatar :user="user" :img-size="24" :issuable-type="issuableType" />
       <slot :user="user"></slot>
     </span>
   </gl-link>
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 3e6be3487b1..ee3972ab3d5 100644
--- a/app/assets/javascripts/sidebar/components/reviewers/uncollapsed_reviewer_list.vue
+++ b/app/assets/javascripts/sidebar/components/reviewers/uncollapsed_reviewer_list.vue
@@ -108,9 +108,8 @@ export default {
         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>
-          <span>@{{ user.username }}</span>
+        <div class="gl-ml-3 gl-line-height-normal gl-display-grid gl-align-items-center">
+          {{ user.name }}
         </div>
       </reviewer-avatar-link>
       <attention-requested-toggle