Automatic merge of gitlab-org/gitlab-ce master

app/assets/stylesheets/framework/timeline.scss

@@ -55,4 +55,5 @@
 .discussion .timeline-entry {
   margin: 0;
   border-right: 0;
+  border-radius: $border-radius-default $border-radius-default 0 0;
 }

app/assets/stylesheets/pages/notes.scss

@@ -107,6 +107,7 @@ $note-form-margin-left: 72px;
 
     &.collapsed {
       color: $gl-text-color-secondary;
+      border-radius: 0 0 $border-radius-default $border-radius-default;
 
       svg {
         float: left;

changelogs/unreleased/58538-discussion-top-radius.yml

+---
+title: Fix border radius of discussions
+merge_request: 28490
+author:
+type: fixed