1 files changed, 24 insertions, 9 deletions
diff --git a/app/assets/javascripts/notes/components/noteable_note.vue b/app/assets/javascripts/notes/components/noteable_note.vue
index a17be51353e..4c02588127e 100644
--- a/app/assets/javascripts/notes/components/noteable_note.vue
+++ b/app/assets/javascripts/notes/components/noteable_note.vue
@@ -27,6 +27,16 @@ export default {
       type: Object,
       required: true,
     },
+    line: {
+      type: Object,
+      required: false,
+      default: null,
+    },
+    helpPagePath: {
+      type: String,
+      required: false,
+      default: '',
+    },
   },
   data() {
     return {
@@ -185,7 +195,7 @@ export default {
         :img-alt="author.name"
         :img-size="40"
       >
-        <slot slot="avatar-badge" name="avatar-badge"> </slot>
+        <slot slot="avatar-badge" name="avatar-badge"></slot>
       </user-avatar-link>
     </div>
     <div class="timeline-content">
@@ -217,14 +227,19 @@ export default {
           @handleResolve="resolveHandler"
         />
       </div>
-      <note-body
-        ref="noteBody"
-        :note="note"
-        :can-edit="note.current_user.can_edit"
-        :is-editing="isEditing"
-        @handleFormUpdate="formUpdateHandler"
-        @cancelForm="formCancelHandler"
-      />
+      <div class="timeline-discussion-body">
+        <slot name="discussion-resolved-text"></slot>
+        <note-body
+          ref="noteBody"
+          :note="note"
+          :line="line"
+          :can-edit="note.current_user.can_edit"
+          :is-editing="isEditing"
+          :help-page-path="helpPagePath"
+          @handleFormUpdate="formUpdateHandler"
+          @cancelForm="formCancelHandler"
+        />
+      </div>
     </div>
   </timeline-entry-item>
 </template>