Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 3 deletions

diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue
index b668d6ec182..fe1a2f0da2a 100644
--- a/app/assets/javascripts/notes/components/noteable_discussion.vue
+++ b/app/assets/javascripts/notes/components/noteable_discussion.vue
@@ -307,7 +307,7 @@ export default {
                   :draft="draftForDiscussion(discussion.reply_id)"
                   :line="line"
                 />
-                <div
+                <li
                   v-else-if="canShowReplyActions && showReplies"
                   :class="{ 'is-replying': isReplying }"
                   class="discussion-reply-holder gl-border-t-0! clearfix"
@@ -334,7 +334,7 @@ export default {
                     @cancelForm="cancelReplyForm"
                   />
                   <note-signed-out-widget v-if="!isLoggedIn" />
-                </div>
+                </li>
               </template>
             </discussion-notes>
           </component>
diff --git a/app/assets/javascripts/notes/components/noteable_note.vue b/app/assets/javascripts/notes/components/noteable_note.vue
index b3c124e511f..99809013bf6 100644
--- a/app/assets/javascripts/notes/components/noteable_note.vue
+++ b/app/assets/javascripts/notes/components/noteable_note.vue
@@ -443,7 +443,7 @@ export default {
       </gl-avatar-link>
     </div>
 
-    <div v-else-if="!isDraft" class="timeline-avatar gl-float-left">
+    <div v-else class="timeline-avatar gl-float-left">
       <gl-avatar-link :href="author.path">
         <gl-avatar
           :src="author.avatar_url"
@@ -516,6 +516,9 @@ export default {
           @handleFormUpdate="formUpdateHandler"
           @cancelForm="formCancelHandler"
         />
+        <div class="timeline-discussion-body-footer">
+          <slot name="after-note-body"></slot>
+        </div>
       </div>
     </div>
   </timeline-entry-item>