Merge branch 'collapsed-conflicted-file' into 'master'

Adjust border radius of collapsed conflicted file

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/149006



Merged-by: Stanislav Lashmanov <slashmanov@gitlab.com>
Approved-by: Chad Lavimoniere <clavimoniere@gitlab.com>
Approved-by: Stanislav Lashmanov <slashmanov@gitlab.com>
Co-authored-by: Annabel Dunstone Gray <annabel.dunstone@gmail.com>

app/assets/javascripts/diffs/components/diff_file.vue

@@ -420,7 +420,14 @@ export default {
       :show-local-file-reviews="showLocalFileReviews"
       :pinned="isPinnedFile"
       class="js-file-title file-title gl-border-1 gl-border-solid gl-border-gray-100"
-      :class="[hasBodyClasses.header, { 'gl-border-red-500! gl-bg-red-200!': file.conflict_type }]"
+      :class="[
+        hasBodyClasses.header,
+        {
+          'gl-border-red-500! gl-bg-red-200!': file.conflict_type,
+          'gl-rounded-bottom-left-none! gl-rounded-bottom-right-none!':
+            file.conflict_type && isCollapsed,
+        },
+      ]"
       @toggleFile="handleToggle({ viaUserInteraction: true })"
       @showForkMessage="showForkMessage"
     />