Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/notes/components/noteable_discussion.vue

@@ -388,6 +388,14 @@ Please check your network connection and try again.`;
                     :help-page-path="helpPagePath"
                     @handleDeleteNote="deleteNoteHandler"
                   >
+                    <note-edited-text
+                      v-if="discussion.resolved"
+                      slot="discussion-resolved-text"
+                      :edited-at="discussion.resolved_at"
+                      :edited-by="discussion.resolved_by"
+                      :action-text="resolvedText"
+                      class-name="discussion-headline-light js-discussion-headline discussion-resolved-text"
+                    />
                     <slot slot="avatar-badge" name="avatar-badge"></slot>
                   </component>
                   <toggle-replies-widget

app/assets/javascripts/notes/components/noteable_note.vue

@@ -199,7 +199,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">
@@ -237,16 +237,19 @@ export default {
           @handleResolve="resolveHandler"
         />
       </div>
-      <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 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>

app/assets/stylesheets/pages/notes.scss

@@ -152,6 +152,16 @@ $note-form-margin-left: 72px;
     display: block;
     position: relative;
 
+    .timeline-discussion-body {
+      margin-top: -8px;
+      overflow-x: auto;
+      overflow-y: hidden;
+
+      .discussion-resolved-text {
+        margin-bottom: 8px;
+      }
+    }
+
     .diff-content {
       overflow: visible;
       padding: 0;

changelogs/unreleased/53954-resolved-non-diff-discussions-on-merge-requests-no-longer-show-who-resolved-them-and-when-at-a-glance.yml

+---
+title: Show message on non-diff discussions
+merge_request:
+author:
+type: changed