Add latest changes from gitlab-org/gitlab@master

4 files changed, 26 insertions, 4 deletions

diff --git a/app/assets/javascripts/issues/list/components/empty_state_with_any_issues.vue b/app/assets/javascripts/issues/list/components/empty_state_with_any_issues.vue
index 3c58843bcbc..a9ad2db5dd3 100644
--- a/app/assets/javascripts/issues/list/components/empty_state_with_any_issues.vue
+++ b/app/assets/javascripts/issues/list/components/empty_state_with_any_issues.vue
@@ -29,6 +29,7 @@ export default {
     :title="$options.i18n.noSearchResultsTitle"
     :svg-path="emptyStateSvgPath"
     :svg-height="150"
+    data-testid="issuable-empty-state"
   >
     <template #actions>
       <gl-button v-if="showNewIssueLink" :href="newIssuePath" variant="confirm">
@@ -42,6 +43,8 @@ export default {
     :description="$options.i18n.noOpenIssuesDescription"
     :title="$options.i18n.noOpenIssuesTitle"
     :svg-path="emptyStateSvgPath"
+    :svg-height="null"
+    data-testid="issuable-empty-state"
   >
     <template #actions>
       <gl-button v-if="showNewIssueLink" :href="newIssuePath" variant="confirm">
@@ -55,5 +58,6 @@ export default {
     :title="$options.i18n.noClosedIssuesTitle"
     :svg-path="emptyStateSvgPath"
     :svg-height="150"
+    data-testid="issuable-empty-state"
   />
 </template>
diff --git a/app/assets/javascripts/issues/list/components/empty_state_without_any_issues.vue b/app/assets/javascripts/issues/list/components/empty_state_without_any_issues.vue
index 3d62ea07f59..6741b39d5ef 100644
--- a/app/assets/javascripts/issues/list/components/empty_state_without_any_issues.vue
+++ b/app/assets/javascripts/issues/list/components/empty_state_without_any_issues.vue
@@ -61,6 +61,7 @@ export default {
       :title="$options.i18n.noIssuesTitle"
       :svg-path="emptyStateSvgPath"
       :svg-height="150"
+      data-testid="issuable-empty-state"
     >
       <template #description>
         <gl-link :href="$options.issuesHelpPagePath">
@@ -71,16 +72,26 @@ export default {
         </p>
       </template>
       <template #actions>
-        <gl-button v-if="canCreateProjects" :href="newProjectPath" variant="confirm">
+        <gl-button
+          v-if="canCreateProjects"
+          :href="newProjectPath"
+          variant="confirm"
+          class="gl-mx-2 gl-mb-3"
+        >
           {{ $options.i18n.newProjectLabel }}
         </gl-button>
-        <gl-button v-if="showNewIssueLink" :href="newIssuePath" variant="confirm">
+        <gl-button
+          v-if="showNewIssueLink"
+          :href="newIssuePath"
+          variant="confirm"
+          class="gl-mx-2 gl-mb-3"
+        >
           {{ $options.i18n.newIssueLabel }}
         </gl-button>
 
         <gl-disclosure-dropdown
           v-if="showCsvButtons"
-          class="gl-w-full gl-sm-w-auto gl-sm-mr-3"
+          class="gl-mx-2 gl-mb-3"
           :toggle-text="$options.i18n.importIssues"
           data-testid="import-issues-dropdown"
         >
@@ -92,7 +103,7 @@ export default {
 
         <new-resource-dropdown
           v-if="showNewIssueDropdown"
-          class="gl-align-self-center"
+          class="gl-align-self-center gl-mx-2 gl-mb-3"
           :query="$options.searchProjectsQuery"
           :query-variables="newIssueDropdownQueryVariables"
           :extract-projects="extractProjects"
@@ -120,8 +131,10 @@ export default {
     v-else
     :title="$options.i18n.noIssuesTitle"
     :svg-path="emptyStateSvgPath"
+    :svg-height="null"
     :primary-button-text="$options.i18n.noIssuesSignedOutButtonText"
     :primary-button-link="signInPath"
+    data-testid="issuable-empty-state"
   >
     <template #description>
       <gl-link :href="$options.issuesHelpPagePath">
diff --git a/app/assets/javascripts/issues/service_desk/components/empty_state_with_any_issues.vue b/app/assets/javascripts/issues/service_desk/components/empty_state_with_any_issues.vue
index ab9e70ae223..f5f06e4daef 100644
--- a/app/assets/javascripts/issues/service_desk/components/empty_state_with_any_issues.vue
+++ b/app/assets/javascripts/issues/service_desk/components/empty_state_with_any_issues.vue
@@ -55,5 +55,6 @@ export default {
     :title="content.title"
     :svg-path="emptyStateSvgPath"
     :svg-height="content.svgHeight"
+    data-testid="issuable-empty-state"
   />
 </template>
diff --git a/app/assets/javascripts/issues/service_desk/components/empty_state_without_any_issues.vue b/app/assets/javascripts/issues/service_desk/components/empty_state_without_any_issues.vue
index 9dbed2c2579..ea866dfb161 100644
--- a/app/assets/javascripts/issues/service_desk/components/empty_state_without_any_issues.vue
+++ b/app/assets/javascripts/issues/service_desk/components/empty_state_without_any_issues.vue
@@ -42,7 +42,9 @@ export default {
     <gl-empty-state
       :title="$options.i18n.infoBannerTitle"
       :svg-path="emptyStateSvgPath"
+      :svg-height="null"
       content-class="gl-max-w-80!"
+      data-testid="issues-service-desk-empty-state"
     >
       <template #description>
         <p v-if="canSeeEmailAddress">
@@ -60,9 +62,11 @@ export default {
     v-else
     :title="$options.i18n.infoBannerTitle"
     :svg-path="emptyStateSvgPath"
+    :svg-height="null"
     :primary-button-text="$options.i18n.noIssuesSignedOutButtonText"
     :primary-button-link="signInPath"
     content-class="gl-max-w-80!"
+    data-testid="issues-service-desk-empty-state"
   >
     <template #description>
       <p>{{ $options.i18n.infoBannerUserNote }}</p>