Automatic merge of gitlab-org/gitlab-ce master

app/assets/stylesheets/pages/notes.scss

@@ -153,12 +153,12 @@ $note-form-margin-left: 72px;
     position: relative;
 
     .timeline-discussion-body {
-      margin-top: -8px;
+      margin-top: -$gl-padding-8;
       overflow-x: auto;
       overflow-y: hidden;
 
-      .discussion-resolved-text {
-        margin-bottom: 8px;
+      .note-body {
+        margin-top: $gl-padding-8;
       }
     }
 

changelogs/unreleased/55958-inconsistent-spacing-between-note-and-user-avatar-in-discussions.yml

+---
+title: Fix spacing on discussions
+merge_request: !24197
+author:
+type: fixed