Automatic merge of gitlab-org/gitlab-ce master

app/assets/stylesheets/pages/notes.scss

@@ -494,11 +494,6 @@ $note-form-margin-left: 72px;
   .discussion-notes {
     margin-left: 0;
     border-left: 0;
-
-    .notes {
-      position: relative;
-      @include vertical-line(52px);
-    }
   }
 
   .note-wrapper {

app/views/shared/issuable/_sidebar.html.haml

@@ -133,7 +133,7 @@
         #js-confidential-entry-point
 
       -# haml-lint:disable InlineJavaScript
-      %script#js-lock-issue-data{ type: "application/json" }= { is_locked: issuable_sidebar[:discussion_locked], is_editable: can_edit_issuable }.to_json.html_safe
+      %script#js-lock-issue-data{ type: "application/json" }= { is_locked: !!issuable_sidebar[:discussion_locked], is_editable: can_edit_issuable }.to_json.html_safe
       #js-lock-entry-point
 
       .js-sidebar-participants-entry-point

changelogs/unreleased/57768-remove-vertical-line.yml

+---
+title: Remove vertical connecting line placeholder from diff discussion notes
+merge_request: 25292
+author:
+type: fixed