Merge branch '205435' into 'master'

Clean up conditional `col-` classes in `nav_dropdown_button.vue`

See merge request gitlab-org/gitlab!25312

app/assets/javascripts/ide/components/nav_dropdown_button.vue

@@ -31,8 +31,8 @@ export default {
 
 <template>
   <dropdown-button>
-    <span class="row">
-      <span class="col-auto text-truncate" :class="{ 'col-7': showMergeRequests }">
+    <span class="row flex-nowrap">
+      <span class="col-auto flex-fill text-truncate">
         <icon :size="16" :aria-label="__('Current Branch')" name="branch" /> {{ branchLabel }}
       </span>
       <span v-if="showMergeRequests" class="col-5 pl-0 text-truncate">

changelogs/unreleased/205435.yml

+---
+title: Clean up conditional `col-` classes in `nav_dropdown_button.vue`
+merge_request: 25312
+author:
+type: other