Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42

1 files changed, 12 insertions, 1 deletions

diff --git a/app/assets/javascripts/vue_shared/components/notes/placeholder_note.vue b/app/assets/javascripts/vue_shared/components/notes/placeholder_note.vue
index d6501a37a35..9ea14ed506c 100644
--- a/app/assets/javascripts/vue_shared/components/notes/placeholder_note.vue
+++ b/app/assets/javascripts/vue_shared/components/notes/placeholder_note.vue
@@ -34,12 +34,23 @@ export default {
       type: Object,
       required: true,
     },
+    line: {
+      type: Object,
+      required: false,
+      default: null,
+    },
   },
   computed: {
     ...mapGetters(['getUserData']),
     renderedNote() {
       return renderMarkdown(this.note.body);
     },
+    avatarSize() {
+      if (this.line) {
+        return 16;
+      }
+      return 40;
+    },
   },
 };
 </script>
@@ -50,7 +61,7 @@ export default {
       <user-avatar-link
         :link-href="getUserData.path"
         :img-src="getUserData.avatar_url"
-        :img-size="40"
+        :img-size="avatarSize"
       />
     </div>
     <div ref="note" :class="{ discussion: !note.individual_note }" class="timeline-content">