Automatic merge of gitlab-org/gitlab-ce master

app/assets/stylesheets/pages/merge_requests.scss

@@ -1019,3 +1019,13 @@
   padding-left: 50px;
   padding-bottom: $gl-padding;
 }
+
+.mr-compare {
+  .diff-file .file-title-flex-parent {
+    top: $header-height + 51px;
+
+    .with-performance-bar & {
+      top: $performance-bar-height + $header-height + 51px;
+    }
+  }
+}

changelogs/unreleased/fix-new-merge-request-diff-headers-sticky-position.yml

+---
+title: Fixed sticky headers in merge request creation diffs
+merge_request:
+author:
+type: fixed