Automatic merge of gitlab-org/gitlab-ce master

3453f12b · GitLab Bot · 250c74df · be1e1cea · 3453f12b · 3453f12b
Commit 3453f12b authored Jun 07, 2019 by GitLab Bot
2 changed files
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -569,7 +569,7 @@ $note-form-margin-left: 72px;
 }
 .discussion-header {
-  min-height: 72px;
+  min-height: 74px;
  .note-header-info {
    padding-bottom: 0;
@@ -582,8 +582,10 @@ $note-form-margin-left: 72px;
 }
 .unresolved {
-  .note-header-info {
+  .discussion-header {
-    margin-top: $gl-padding-8;
+    .note-header-info {
+      margin-top: $gl-padding-8;
+    }
  }
 }

--- a/changelogs/unreleased/61565-merge-request-discussion-text-jumps-when-resolved.yml
+++ b/changelogs/unreleased/61565-merge-request-discussion-text-jumps-when-resolved.yml
+---
+title: Resolve Merge request discussion text jumps when resolved
+merge_request: 28995
+author:
+type: fixed