Merge branch 'revert-4e045cd5' into 'master'

Revert "Merge branch 'fix/missing-border' into 'master'"

See merge request gitlab-org/gitlab-ce!26980

app/assets/stylesheets/pages/notes.scss

@@ -44,7 +44,6 @@ $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