Add latest changes from gitlab-org/gitlab@master

2 files changed, 10 insertions, 2 deletions

diff --git a/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_filters.vue b/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_filters.vue
index b9d1c4b0fe0..0de62013a63 100644
--- a/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_filters.vue
+++ b/app/assets/javascripts/analytics/cycle_analytics/components/value_stream_filters.vue
@@ -82,6 +82,7 @@ export default {
       <div>
         <projects-dropdown-filter
           v-if="hasProjectFilter"
+          toggle-classes="gl-max-w-26"
           class="js-projects-dropdown-filter project-select gl-mb-2 gl-lg-mb-0"
           :group-namespace="groupPath"
           :query-params="projectsQueryParams"
diff --git a/app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue b/app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue
index fc37e413961..f881c924ae5 100644
--- a/app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue
+++ b/app/assets/javascripts/analytics/shared/components/projects_dropdown_filter.vue
@@ -50,6 +50,11 @@ export default {
       required: false,
       default: false,
     },
+    toggleClasses: {
+      type: String,
+      required: false,
+      default: '',
+    },
   },
   data() {
     return {
@@ -222,7 +227,6 @@ export default {
 <template>
   <gl-collapsible-listbox
     ref="projectsDropdown"
-    toggle-class="gl-shadow-none gl-mb-0"
     :header-text="__('Projects')"
     :items="listBoxItems"
     :reset-button-label="__('Clear All')"
@@ -238,7 +242,10 @@ export default {
     @select="onSelected"
   >
     <template #toggle>
-      <gl-button class="dropdown-projects">
+      <gl-button
+        button-text-classes="gl-w-full gl-justify-content-space-between gl-display-flex gl-shadow-none gl-mb-0"
+        :class="['dropdown-projects', toggleClasses]"
+      >
         <gl-avatar
           v-if="isOnlyOneProjectSelected"
           :src="selectedProjects[0].avatarUrl"