Add latest changes from gitlab-org/gitlab@master

doc/api/issues.md

@@ -55,7 +55,7 @@ GET /issues?state=opened
 ```
 
 | Attribute                       | Type          | Required   | Description                                                                                                                                         |
-| ------------------- | ---------------- | ---------- | --------------------------------------------------------------------------------------------------------------------------------------------------- |
+|---------------------------------|---------------| ---------- | --------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `assignee_id`                   | integer       | no         | Return issues assigned to the given user `id`. Mutually exclusive with `assignee_username`. `None` returns unassigned issues. `Any` returns issues with an assignee. |
 | `assignee_username`             | string array  | no         | Return issues assigned to the given `username`. Similar to `assignee_id` and mutually exclusive with `assignee_id`. In GitLab CE, the `assignee_username` array should only contain a single value. Otherwise, an invalid parameter error is returned. |
 | `author_id`                     | integer       | no         | Return issues created by the given user `id`. Mutually exclusive with `author_username`. Combine with `scope=all` or `scope=assigned_to_me`. |
@@ -65,6 +65,7 @@ GET /issues?state=opened
 | `created_before`                | datetime      | no         | Return issues created on or before the given time. Expected in ISO 8601 format (`2019-03-15T08:00:00Z`) |
 | `due_date`                      | string        | no         | Return issues that have no due date, are overdue, or whose due date is this week, this month, or between two weeks ago and next month. Accepts: `0` (no due date), `any`, `today`, `tomorrow`, `overdue`, `week`, `month`, `next_month_and_previous_two_weeks`. |
 | `epic_id` **(PREMIUM)**         | integer       | no         | Return issues associated with the given epic ID. `None` returns issues that are not associated with an epic. `Any` returns issues that are associated with an epic. _([Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46887) in GitLab 13.6)_
+| `health_status` **(ULTIMATE)**  | string        | no         | Return issues with the specified `health_status`. _([Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/370721) in GitLab 15.4)_
 | `iids[]`                        | integer array | no         | Return only the issues having the given `iid`                                                                                                       |
 | `in`                            | string        | no         | Modify the scope of the `search` attribute. `title`, `description`, or a string joining them with comma. Default is `title,description`             |
 | `issue_type`                    | string        | no         | Filter to a given type of issue. One of `issue`, `incident`, or `test_case`. _([Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/260375) in GitLab 13.12)_ |

spec/frontend/groups/components/overview_tabs_spec.js

@@ -1,9 +1,11 @@
 import { GlTab } from '@gitlab/ui';
 import { nextTick } from 'vue';
+import { createLocalVue } from '@vue/test-utils';
 import AxiosMockAdapter from 'axios-mock-adapter';
 import { mountExtended } from 'helpers/vue_test_utils_helper';
 import OverviewTabs from '~/groups/components/overview_tabs.vue';
 import GroupsApp from '~/groups/components/app.vue';
+import GroupFolderComponent from '~/groups/components/group_folder.vue';
 import GroupsStore from '~/groups/store/groups_store';
 import GroupsService from '~/groups/service/groups_service';
 import { createRouter } from '~/groups/init_overview_tabs';
@@ -14,10 +16,13 @@ import {
 } from '~/groups/constants';
 import axios from '~/lib/utils/axios_utils';
 
+const localVue = createLocalVue();
+localVue.component('GroupFolder', GroupFolderComponent);
 const router = createRouter();
 
 describe('OverviewTabs', () => {
   let wrapper;
+  let axiosMock;
 
   const endpoints = {
     subgroups_and_projects: '/groups/foobar/-/children.json',
@@ -36,7 +41,15 @@ describe('OverviewTabs', () => {
       router,
       provide: {
         endpoints,
+        newSubgroupPath: '/groups/new',
+        newProjectPath: 'projects/new',
+        newSubgroupIllustration: '',
+        newProjectIllustration: '',
+        emptySubgroupIllustration: '',
+        canCreateSubgroups: false,
+        canCreateProjects: false,
       },
+      localVue,
       mocks: { $route: route, $router: routerMock },
     });
 
@@ -47,13 +60,13 @@ describe('OverviewTabs', () => {
   const findTab = (name) => wrapper.findByRole('tab', { name });
   const findSelectedTab = () => wrapper.findByRole('tab', { selected: true });
 
-  afterEach(() => {
+  beforeEach(() => {
-    wrapper.destroy();
+    axiosMock = new AxiosMockAdapter(axios);
   });
 
-  beforeEach(async () => {
+  afterEach(() => {
-    // eslint-disable-next-line no-new
+    wrapper.destroy();
-    new AxiosMockAdapter(axios);
+    axiosMock.restore();
   });
 
   it('renders `Subgroups and projects` tab with `GroupsApp` component', async () => {