1 files changed, 23 insertions, 2 deletions

diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue
index 6a921c9908a..2a6e8a17fe4 100644
--- a/app/assets/javascripts/notes/components/noteable_discussion.vue
+++ b/app/assets/javascripts/notes/components/noteable_discussion.vue
@@ -111,6 +111,13 @@ export default {
     newNotePath() {
       return this.getNoteableData.create_note_path;
     },
+    lastNote() {
+      if (notes.length > 1) {
+        return notes[notes.length - 1];
+      }
+
+      return null;
+    },
     lastUpdatedBy() {
       const { notes } = this.note;
 
@@ -274,7 +281,21 @@ Please check your network connection and try again.`;
               :action-text-html="actionTextHtml"
             />
             <note-edited-text
-              v-if="lastUpdatedAt"
+              v-if="discussion.resolved && discussion.resolved_by_push"
+              :edited-at="discussion.resolved_at"
+              :edited-by="discussion.resolved_by"
+              action-text="Automatically resolved with a push"
+              class-name="discussion-headline-light js-discussion-headline"
+            />
+            <note-edited-text
+              v-if="discussion.resolved && !discussion.resolved_by_push"
+              :edited-at="discussion.resolved_at"
+              :edited-by="discussion.resolved_by"
+              action-text="Resolved"
+              class-name="discussion-headline-light js-discussion-headline"
+            />
+            <note-edited-text
+              v-if="lastUpdatedAt && !discussion.resolved"
               :edited-at="lastUpdatedAt"
               :edited-by="lastUpdatedBy"
               action-text="Last updated"
@@ -282,7 +303,7 @@ Please check your network connection and try again.`;
             />
           </div>
           <div
-            v-if="note.expanded || alwaysExpanded"
+            v-show="note.expanded || alwaysExpanded"
             class="discussion-body">
             <component
               :is="wrapperComponent"