Automatic merge of gitlab-org/gitlab-ce master

app/assets/stylesheets/pages/notes.scss

@@ -44,6 +44,7 @@ $note-form-margin-left: 72px;
     border: 1px solid $border-color;
     border-radius: $border-radius-default;
     margin: $gl-padding 0;
+    overflow: auto;
 
     &.system-note,
     &.note-form {

changelogs/unreleased/fix-missing-border.yml

+---
+title: Fixes missing border color in discussion card component
+merge_request: 26242
+author: Farhad Yasir
+type: fixed