Add latest changes from gitlab-org/gitlab@master

8 files changed, 148 insertions, 37 deletions

diff --git a/doc/api/linked_epics.md b/doc/api/linked_epics.md
index 2f46786251c..df302be0555 100644
--- a/doc/api/linked_epics.md
+++ b/doc/api/linked_epics.md
@@ -91,6 +91,8 @@ Example response:
 
 ## Create a related epic link
 
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/352840) in GitLab 14.10.
+
 Create a two-way relation between two epics. The user must be allowed to
 update both epics to succeed.
 
@@ -205,3 +207,120 @@ Example response:
   "link_type": "relates_to"
 }
 ```
+
+## Delete a related epic link
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/352840) in GitLab 14.10.
+
+Delete a two-way relation between two epics. The user must be allowed to
+update both epics to succeed.
+
+```plaintext
+DELETE /groups/:id/epics/:epic_iid/related_epics/:related_epic_link_id
+```
+
+Supported attributes:
+
+| Attribute                | Type           | Required                    | Description                           |
+|--------------------------|----------------|-----------------------------|---------------------------------------|
+| `epic_iid`               | integer        | **{check-circle}** Yes      | Internal ID of a group's epic.        |
+| `id`                     | integer/string | **{check-circle}** Yes      | ID or [URL-encoded path of the group](index.md#namespaced-path-encoding) owned by the authenticated user. |
+| `related_epic_link_id`   | integer/string | **{check-circle}** Yes      | Internal ID of a related epic link. |
+
+Example request:
+
+```shell
+curl --request DELETE --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/groups/26/epics/1/related_epics/1"
+```
+
+Example response:
+
+```json
+{
+  "source_epic": {
+    "id": 21,
+    "iid": 1,
+    "color": "#1068bf",
+    "text_color": "#FFFFFF",
+    "group_id": 26,
+    "parent_id": null,
+    "parent_iid": null,
+    "title": "Aspernatur recusandae distinctio omnis et qui est iste.",
+    "description": "some description",
+    "confidential": false,
+    "author": {
+      "id": 15,
+      "username": "trina",
+      "name": "Theresia Robel",
+      "state": "active",
+      "avatar_url": "https://www.gravatar.com/avatar/085e28df717e16484cbf6ceca75e9a93?s=80&d=identicon",
+      "web_url": "http://gitlab.example.com/trina"
+    },
+    "start_date": null,
+    "end_date": null,
+    "due_date": null,
+    "state": "opened",
+    "web_url": "http://gitlab.example.com/groups/flightjs/-/epics/1",
+    "references": {
+      "short": "&1",
+      "relative": "&1",
+      "full": "flightjs&1"
+    },
+    "created_at": "2022-01-31T15:10:44.988Z",
+    "updated_at": "2022-03-16T09:32:35.712Z",
+    "closed_at": null,
+    "labels": [],
+    "upvotes": 0,
+    "downvotes": 0,
+    "_links": {
+      "self": "http://gitlab.example.com/api/v4/groups/26/epics/1",
+      "epic_issues": "http://gitlab.example.com/api/v4/groups/26/epics/1/issues",
+      "group": "http://gitlab.example.com/api/v4/groups/26",
+      "parent": null
+    }
+  },
+  "target_epic": {
+    "id": 25,
+    "iid": 5,
+    "color": "#1068bf",
+    "text_color": "#FFFFFF",
+    "group_id": 26,
+    "parent_id": null,
+    "parent_iid": null,
+    "title": "Aut assumenda id nihil distinctio fugiat vel numquam est.",
+    "description": "some description",
+    "confidential": false,
+    "author": {
+      "id": 3,
+      "username": "valerie",
+      "name": "Erika Wolf",
+      "state": "active",
+      "avatar_url": "https://www.gravatar.com/avatar/9ef7666abb101418a4716a8ed4dded80?s=80&d=identicon",
+      "web_url": "http://gitlab.example.com/valerie"
+    },
+    "start_date": null,
+    "end_date": null,
+    "due_date": null,
+    "state": "opened",
+    "web_url": "http://gitlab.example.com/groups/flightjs/-/epics/5",
+    "references": {
+      "short": "&5",
+      "relative": "&5",
+      "full": "flightjs&5"
+    },
+    "created_at": "2022-01-31T15:10:45.080Z",
+    "updated_at": "2022-03-16T09:32:35.842Z",
+    "closed_at": null,
+    "labels": [],
+    "upvotes": 0,
+    "downvotes": 0,
+    "_links": {
+      "self": "http://gitlab.example.com/api/v4/groups/26/epics/5",
+      "epic_issues": "http://gitlab.example.com/api/v4/groups/26/epics/5/issues",
+      "group": "http://gitlab.example.com/api/v4/groups/26",
+      "parent": null
+    }
+  },
+  "link_type": "relates_to"
+}
+```
diff --git a/doc/development/testing_guide/best_practices.md b/doc/development/testing_guide/best_practices.md
index fe0c4c13ba2..09306dfc2a7 100644
--- a/doc/development/testing_guide/best_practices.md
+++ b/doc/development/testing_guide/best_practices.md
@@ -404,7 +404,7 @@ click_link _('UI testing docs')
 
 fill_in _('Search projects'), with: 'gitlab' # fill in text input with text
 
-select _('Last updated'), from: 'Sort by' # select an option from a select input
+select _('Updated date'), from: 'Sort by' # select an option from a select input
 
 check _('Checkbox label')
 uncheck _('Checkbox label')
@@ -465,8 +465,8 @@ expect(page).to have_checked_field _('Checkbox label')
 expect(page).to have_unchecked_field _('Radio input label')
 
 expect(page).to have_select _('Sort by')
-expect(page).to have_select _('Sort by'), selected: 'Last updated' # assert the option is selected
-expect(page).to have_select _('Sort by'), options: ['Last updated', 'Created date', 'Due date'] # assert an exact list of options
+expect(page).to have_select _('Sort by'), selected: 'Updated date' # assert the option is selected
+expect(page).to have_select _('Sort by'), options: ['Updated date', 'Created date', 'Due date'] # assert an exact list of options
 expect(page).to have_select _('Sort by'), with_options: ['Created date', 'Due date'] # assert a partial list of options
 
 expect(page).to have_text _('Some paragraph text.')
diff --git a/doc/integration/jira/issues.md b/doc/integration/jira/issues.md
index e24862242e1..28998851697 100644
--- a/doc/integration/jira/issues.md
+++ b/doc/integration/jira/issues.md
@@ -106,7 +106,7 @@ sorts by **Created date** by default, with the newest issues listed at the top:
 
 ![Jira issues integration enabled](img/open_jira_issues_list_v14_6.png)
 
-- To display the most recently updated issues first, select **Last updated**.
+- To display the most recently updated issues first, select **Updated date**.
 - You can [search and filter](#search-and-filter-the-issues-list) the issues list.
 - In GitLab [versions 13.10 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/299832),
   you can select an issue from the list to view it in GitLab:
diff --git a/doc/user/admin_area/index.md b/doc/user/admin_area/index.md
index 08fb756e79f..f57672d3d36 100644
--- a/doc/user/admin_area/index.md
+++ b/doc/user/admin_area/index.md
@@ -79,28 +79,29 @@ To access the Projects page:
 By default, all projects are listed, in reverse order of when they were last updated. For each
 project, the following information is listed:
 
-- Name.
-- Namespace.
-- Description.
-- Size, updated every 15 minutes at most.
+- Name
+- Namespace
+- Description
+- Size, updated every 15 minutes at most
 
 Projects can be edited or deleted.
 
 The list of projects can be sorted by:
 
-- Name.
-- Last created.
-- Oldest created.
-- Last updated.
-- Oldest updated.
-- Owner.
+- Updated date
+- Last created
+- Name
+- Most stars
+- Oldest created
+- Oldest updated
+- Largest repository
 
 A user can choose to hide or show archived projects in the list.
 
 In the **Filter by name** field, type the project name you want to find, and GitLab filters
 them as you type.
 
-Select from the **Namespace** dropdown to filter only projects in that namespace.
+To filter only projects in that namespace, select from the **Namespace** dropdown list.
 
 You can combine the filter options. For example, to list only public projects with `score` in their name:
 
diff --git a/doc/user/project/issues/sorting_issue_lists.md b/doc/user/project/issues/sorting_issue_lists.md
index 9311ef590df..95a7e9387e8 100644
--- a/doc/user/project/issues/sorting_issue_lists.md
+++ b/doc/user/project/issues/sorting_issue_lists.md
@@ -6,20 +6,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Sorting and ordering issue lists **(FREE)**
 
-You can sort a list of issues several ways, including by:
-
-- [Blocking issues](#sorting-by-blocking-issues)
-- [Created date](#sorting-by-created-date)
-- [Due date](#sorting-by-due-date)
-- [Label priority](#sorting-by-label-priority)
-- [Last updated](#sorting-by-last-updated)
-- [Manual sorting](#manual-sorting)
-- [Milestone due date](#sorting-by-milestone-due-date)
-- [Popularity](#sorting-by-popularity)
-- [Priority](#sorting-by-priority)
-- [Title](#sorting-by-title)
-- [Weight](#sorting-by-weight)
-
+You can sort a list of issues several ways.
 The available sorting options can change based on the context of the list.
 
 ## Sorting by blocking issues **(PREMIUM)**
@@ -51,10 +38,10 @@ For more information, see [issue 14523](https://gitlab.com/gitlab-org/gitlab/-/i
 
 To learn how to change label priority, see [Label priority](../labels.md#set-label-priority).
 
-## Sorting by last updated
+## Sorting by updated date
 
-When you sort by **Last updated**, the issue list changes to sort by the time of a last
-update. Issues changed the most recently are first.
+When you sort by **Updated date**, the issue list changes to sort by the time of a last
+update. Issues changed the most recently are shown first.
 
 ## Manual sorting
 
diff --git a/doc/user/project/requirements/index.md b/doc/user/project/requirements/index.md
index 6abe9c08d28..8b80c494e2f 100644
--- a/doc/user/project/requirements/index.md
+++ b/doc/user/project/requirements/index.md
@@ -127,7 +127,7 @@ To search for a requirement:
 You can also sort the requirements list by:
 
 - Created date
-- Last updated
+- Updated date
 
 ## Allow requirements to be satisfied from a CI job
 
diff --git a/doc/user/search/img/sort_projects.png b/doc/user/search/img/sort_projects.png
deleted file mode 100644
index 9bf2770b299..00000000000
--- a/doc/user/search/img/sort_projects.png
+++ /dev/null
diff --git a/doc/user/search/index.md b/doc/user/search/index.md
index 44327af380e..21f35e76418 100644
--- a/doc/user/search/index.md
+++ b/doc/user/search/index.md
@@ -207,10 +207,14 @@ You can also look for the projects you [starred](../project/working_with_project
 You can **Explore** all public and internal projects available in GitLab.com, from which you can filter by visibility,
 through **Trending**, best rated with **Most stars**, or **All** of them.
 
-You can also sort them by **Name**, **Last created**, **Oldest created**, **Last updated**,
-**Oldest updated**, **Owner**, and choose to hide or show **archived projects**:
+You can also sort them by:
 
-![sort projects](img/sort_projects.png)
+- Name
+- Created date
+- Updated date
+- Owner
+
+You can also choose to hide or show archived projects.
 
 ## Groups
 
@@ -221,7 +225,7 @@ On the field **Filter by name**, type the group name you want to find, and GitLa
 filters them for you as you type.
 
 You can also **Explore** all public and internal groups available in GitLab.com,
-and sort them by **Last created**, **Oldest created**, **Last updated**, or **Oldest updated**.
+and sort them by **Name**, **Last created**, **Oldest created**, or **Updated date**.
 
 ## Issue boards